DP-481 : cleanup to get all python tests but one to pass

- working around numpy API for passing variables for now
prasadadhav · Feb 1, 2022 · 43e98be · 43e98be
1 parent ef4c1e5
commit 43e98be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cmake/DakotaExamplesAddTests.cmake b/cmake/DakotaExamplesAddTests.cmake
@@ -38,8 +38,9 @@ function(apply_test_properties _test_name _depends_on)
 
   add_conditional_dependence(${_test_name} "${_depends_on}")
 
+  get_filename_component(_python_exe_dir ${Python_EXECUTABLE} DIRECTORY)
   set(_env_path
-    "PATH=${DAKOTA_DPREPRO_PATH}:${DAKOTA_TEST_DRIVERS_PATH}:$ENV{PATH}")
+    "PATH=${_python_exe_dir}:${DAKOTA_DPREPRO_PATH}:${DAKOTA_TEST_DRIVERS_PATH}:$ENV{PATH}")
   set(_env_python_path "PYTHONPATH=${DAKOTA_PYTHON_PATH}:$ENV{PYTHONPATH}")
 
   # Can only have generator expressions in certain commands:

diff --git a/official/drivers/Python/linked/rosenbrock.py b/official/drivers/Python/linked/rosenbrock.py
@@ -1,4 +1,4 @@
-def rosenbrock_list(**kwargs):
+def rosenbrock_list(kwargs):
 
     num_fns = kwargs['functions']
  #   if num_fns > 1:
@@ -38,7 +38,7 @@ def rosenbrock_list(**kwargs):
 
     return(retval)
 
-def rosenbrock_numpy(**kwargs):
+def rosenbrock_numpy(kwargs):
 
     from numpy import array
 

diff --git a/official/drivers/Python/pybind11/dakota_textbook_pybind11.in b/official/drivers/Python/pybind11/dakota_textbook_pybind11.in
@@ -11,7 +11,7 @@ variables,
     descriptors 'x1'  'x2'  'x3'
 
 interface,
-    pybind11
+    python
       analysis_driver = 'driver-np-or-list:text_book'
 
 responses,

diff --git a/official/surrogates/library/benchmark_functions.py b/official/surrogates/library/benchmark_functions.py
@@ -1,7 +1,7 @@
 import numpy as np
 
 def unpack_inputs(params):
-    x = params["cv"]
+    x = np.array(params["cv"])
     ASV = params["asv"]
     return x, ASV
 
@@ -86,7 +86,7 @@ def Dette_and_Peplyshev(**kwargs):
         retval["fns"] = np.array([f])
     return retval
 
-def Morris(**kwargs):
+def Morris(kwargs):
     """
     input space: [0, 1]**20
     """