Revert "Intrepid2: Vector adaptor for ROL functional. Add test for ad…

…aptor."

This reverts commit b1bfe01.

packages/intrepid/src/Shared/MiniTensor/Intrepid_MiniTensor_TensorBase.h

@@ -59,7 +59,6 @@ enum ComponentValue {
  ZEROS,
  ONES,
  SEQUENCE,
- RANDOM,
  RANDOM_UNIFORM,
  RANDOM_NORMAL,
  NANS

packages/intrepid/src/Shared/MiniTensor/Intrepid_MiniTensor_TensorBase.i.h

@@ -412,14 +412,6 @@ TensorBase<T, ST>::fill(ComponentValue const value)
  }
  break;
 
- case RANDOM:
- for (Index i = 0; i < number_components; ++i) {
- auto & entry = (*this)[i];
- fill_AD<T>(entry, Teuchos::ScalarTraits<S>::zero());
- entry = random<T>();
- }
- break;
-
  case RANDOM_NORMAL:
  for (Index i = 0; i < number_components; ++i) {
  auto & entry = (*this)[i];

packages/intrepid2/cmake/Dependencies.cmake

@@ -1,5 +1,5 @@
 SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Shards Sacado KokkosCore KokkosContainers KokkosAlgorithms)
-SET(LIB_OPTIONAL_DEP_PACKAGES Rol)
+SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES Gtest)
 SET(TEST_OPTIONAL_DEP_PACKAGES Epetra EpetraExt Amesos Pamgen)
 SET(LIB_REQUIRED_DEP_TPLS)

packages/intrepid2/cmake/Intrepid2_config.h.in

@@ -19,6 +19,3 @@
 /* Define if want to build with sacado enabled */
 #cmakedefine HAVE_INTREPID2_SACADO
 
-/* Define if want to build with rol enabled */
-#cmakedefine HAVE_INTREPID2_ROL
-

packages/intrepid2/core/src/CMakeLists.txt

@@ -119,17 +119,6 @@ IF (Intrepid2_ENABLE_Boost)
  )
  IF (Intrepid2_ENABLE_ROL)
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared/MiniTensor/rol)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../../rol/src)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/algorithm)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/elementwise)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/function)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/sol)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/status)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/step)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/utils)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/vector)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../rol/src/zoo)
  APPEND_SET(HEADERS ${HEADERS}
  Shared/MiniTensor/rol/Intrepid2_MiniTensor_ROL_Vector.h
  Shared/MiniTensor/rol/Intrepid2_MiniTensor_ROL_Vector.t.h

packages/intrepid2/core/src/Shared/MiniTensor/Intrepid2_MiniTensor_TensorBase.h

@@ -59,7 +59,6 @@ enum ComponentValue {
  ZEROS,
  ONES,
  SEQUENCE,
- RANDOM,
  RANDOM_UNIFORM,
  RANDOM_NORMAL,
  NANS

packages/intrepid2/core/src/Shared/MiniTensor/Intrepid2_MiniTensor_TensorBase.i.h

@@ -409,14 +409,6 @@ TensorBase<T, ST>::fill(ComponentValue const value)
  }
  break;
 
- case RANDOM:
- for (Index i = 0; i < number_components; ++i) {
- auto & entry = (*this)[i];
- fill_AD<T>(entry, Teuchos::ScalarTraits<S>::zero());
- entry = random<T>();
- }
- break;
-
  case RANDOM_UNIFORM:
  for (Index i = 0; i < number_components; ++i) {
  auto & entry = (*this)[i];

packages/intrepid2/core/src/Shared/MiniTensor/rol/Intrepid2_MiniTensor_ROL_Vector.h

@@ -39,16 +39,17 @@
 // ************************************************************************
 // @HEADER
 
+#if defined(ENABLE_ROL)
 #if !defined(Intrepid2_MiniTensor_ROL_Vector_h)
 #define Intrepid2_MiniTensor_ROL_Vector_h
 
 #include <Intrepid2_MiniTensor.h>
-#include <vector/ROL_Vector.hpp>
+#include "ROL_Vector.hpp"
 
 namespace ROL
 {
 
-template <typename T, Intrepid2::Index N>
+template <typename T, Index N>
 class MiniTensorVector : public Vector<T> {
 
  using uint = Intrepid2::Index;
@@ -65,12 +66,6 @@ class MiniTensorVector : public Vector<T> {
  return;
  }
 
- virtual
- ~MiniTensorVector()
- {
- return;
- }
-
  void
  set(Vector<T> const & x)
  {
@@ -99,7 +94,7 @@ class MiniTensorVector : public Vector<T> {
  auto const
  dim = xval.get_dimension();
 
- for (auto i = 0; i < dim; ++i) {
+ for (auto const i = 0; i < dim; ++i) {
  vector_(i) += xval(i);
  }
  }
@@ -120,7 +115,7 @@ class MiniTensorVector : public Vector<T> {
 
  assert(vector_.get_dimension() == dim);
 
- for (auto i = 0; i < dim; ++i) {
+ for (auto const i = 0; i < dim); ++i) {
  vector_(i) += alpha * xval(i);
  }
  }
@@ -131,7 +126,7 @@ class MiniTensorVector : public Vector<T> {
  auto const
  dim = vector_.get_dimension();
 
- for (auto i = 0; i < dim; ++i) {
+ for (auto const i = 0; i < dim); ++i) {
  vector_(i) *= alpha;
  }
  }
@@ -204,14 +199,14 @@ class MiniTensorVector : public Vector<T> {
  int
  dimension() const
  {
- return static_cast<int>(vector_.get_dimension());
+ return static_cast<int>(vector_->get_dimension());
  }
 
  void
  applyUnary(Elementwise::UnaryFunction<T> const & f)
  {
  auto const
- dim = vector_.get_dimension();
+ dim = vector_->get_dimension();
 
  for(auto i{0}; i < dim; ++i) {
  vector_(i) = f.apply(vector_(i));
@@ -228,7 +223,7 @@ class MiniTensorVector : public Vector<T> {
  xval = ex.getVector();
 
  auto const
- dim = vector_.get_dimension();
+ dim = vector_->get_dimension();
 
  for(auto i{0}; i < dim; ++i) {
  vector_(i) = f.apply(vector_(i), xval(i));
@@ -242,7 +237,7 @@ class MiniTensorVector : public Vector<T> {
  result = r.initialValue();
 
  auto const
- dim = vector_.get_dimension();
+ dim = vector_->get_dimension();
 
  for(auto i{0}; i < dim; ++i) {
  r.reduce(vector_(i), result);
@@ -257,3 +252,4 @@ class MiniTensorVector : public Vector<T> {
 #include "Intrepid2_MiniTensor_ROL_Vector.t.h"
 
 #endif // Intrepid2_MiniTensor_ROL_Vector_h
+#endif // ENABLE_ROL

packages/intrepid2/core/test/Shared/MiniTensor/CMakeLists.txt

@@ -17,15 +17,3 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
  PASS_REGULAR_EXPRESSION "PASSED"
  ADD_DIR_TO_NAME
  )
-
-IF (Intrepid2_ENABLE_ROL)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
- Test_03
- SOURCES test_03.cc
- ARGS PrintItAll
- NUM_MPI_PROCS 1
- PASS_REGULAR_EXPRESSION "PASSED"
- ADD_DIR_TO_NAME
- )
-ENDIF()
-