Merge pull request #54 from ytopt-team/develop1

Develop1
ytopt-team · Jul 6, 2023 · c7740d9 · c7740d9
2 parents 39c454b + b6fa770
commit c7740d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ytopt/benchmark/xsbench-mpi-omp/xsbench/problem_cons.py b/ytopt/benchmark/xsbench-mpi-omp/xsbench/problem_cons.py
@@ -8,7 +8,8 @@
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(1, os.path.dirname(HERE)+ '/plopper')
-from plopper import Plopper
+from ytopt.benchmark.plopper.plublic_plopper import CompilePlopper
+from ytopt.benchmark.plopper.cmds import MAT_GCC_CMD
 
 # create an object of ConfigSpace
 cs = CS.ConfigurationSpace(seed=1234)
@@ -36,7 +37,8 @@
 dir_path = os.path.dirname(os.path.realpath(__file__))
 kernel_idx = dir_path.rfind('/')
 kernel = dir_path[kernel_idx+1:]
-obj = Plopper(dir_path+'/mmp_cons.c',dir_path)
+obj = CompilePlopper(dir_path+'/mmp_cons.c',dir_path)
+obj.set_compile_command(MAT_GCC_CMD)
 
 x1=['p0','p1','p2','p3']
 def myobj(point: dict):

diff --git a/ytopt/benchmark/xsbench-omp/xsbench/problem_cons.py b/ytopt/benchmark/xsbench-omp/xsbench/problem_cons.py
@@ -8,7 +8,8 @@
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(1, os.path.dirname(HERE)+ '/plopper')
-from plopper import Plopper
+from ytopt.benchmark.plopper import CompilePlopper
+from ytopt.benchmark.plopper.cmds import MAT_GCC_CMD
 
 # create an object of ConfigSpace
 cs = CS.ConfigurationSpace(seed=1234)
@@ -39,7 +40,8 @@
 dir_path = os.path.dirname(os.path.realpath(__file__))
 kernel_idx = dir_path.rfind('/')
 kernel = dir_path[kernel_idx+1:]
-obj = Plopper(dir_path+'/mmp_cons.c',dir_path)
+obj = CompilePlopper(dir_path+'/mmp_cons.c',dir_path)
+obj.set_compile_command(MAT_GCC_CMD)
 
 x1=['p0','p1','p2','p3']
 def myobj(point: dict):