Merge pull request #31 from gregvw/unsupportedPyROL

pyrol: Allow to import unsupported classes
trilinos · Dec 15, 2023 · 593e6b3 · 593e6b3
2 parents 58f077f + 873a3ce
commit 593e6b3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/packages/rol/pyrol/python/__init__.py b/packages/rol/pyrol/python/__init__.py
@@ -1,9 +1,7 @@
 import importlib
-from types import SimpleNamespace
 
 from . getTypeName import getTypeName, getDefaultScalarType, ROL_classes, ROL_members
 
-
 __version__ = '0.1.0'
 def version():
     return 'PyROL version: ' + __version__
@@ -19,10 +17,10 @@ def wrapper(scalarType=getDefaultScalarType()):
 defaultScalarType = getDefaultScalarType()
 
 supported_objects = {"Bounds", "Constraint", "LinearOperator",
-                     "LinearConstraint", "Objective", "Problem", "Solver", 
+                     "LinearConstraint", "Objective", "Problem", "Solver",
                      "Vector", "getCout", "getParametersFromXmlFile"}
 
-unsupported = SimpleNamespace()
+unsupported = importlib.import_module('.unsupported', 'pyrol')
 
 for classnameLong in ROL_members:
     class_obj, _ = ROL_members[classnameLong]
@@ -43,8 +41,5 @@ def wrapper(scalarType=getDefaultScalarType()):
         setattr(unsupported, classname, getTypeName(classname, defaultScalarType))
         setattr(unsupported, classname + '_forScalar', getWrapper(classname))
 
-locals().update({'unsupported': unsupported})
-
-del importlib, SimpleNamespace, getTypeName, getDefaultScalarType, ROL_classes, ROL_members
+del importlib, getTypeName, getDefaultScalarType, ROL_classes, ROL_members
 del class_obj, classname, classnameLong, getWrapper, pos
-
diff --git a/packages/rol/pyrol/python/unsupported.py b/packages/rol/pyrol/python/unsupported.py
@@ -0,0 +1,2 @@
+# A sub-module that holds the unsupported classes.
+# Content gets populated automatically.
diff --git a/packages/rol/pyrol/test/CMakeLists.txt b/packages/rol/pyrol/test/CMakeLists.txt
@@ -2,3 +2,5 @@ ENABLE_TESTING()
 
 ADD_SUBDIRECTORY(algorithm)
 FILE(COPY algorithm DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ADD_SUBDIRECTORY(unsupported)
+FILE(COPY unsupported DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/rol/pyrol/test/unsupported/CMakeLists.txt b/packages/rol/pyrol/test/unsupported/CMakeLists.txt
@@ -0,0 +1,3 @@
+INCLUDE(PythonTest)
+
+PYTHON_ADD_TEST(testUnsupported)
diff --git a/packages/rol/pyrol/test/unsupported/testUnsupported.py b/packages/rol/pyrol/test/unsupported/testUnsupported.py
@@ -0,0 +1 @@
+from pyrol.unsupported import Reduced_Objective_SimOpt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# A sub-module that holds the unsupported classes.
		# Content gets populated automatically.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		INCLUDE(PythonTest)

		PYTHON_ADD_TEST(testUnsupported)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from pyrol.unsupported import Reduced_Objective_SimOpt