Fix cmake for non-binary opts

jarvis_util/__init__.py

@@ -14,14 +14,18 @@
 from jarvis_util.serialize.pickle import *
 from jarvis_util.serialize.json_file import *
 from jarvis_util.shell.filesystem import *
+from jarvis_util.shell.pbs_exec import *
 from jarvis_util.shell.exec import *
 from jarvis_util.shell.exec_info import *
 from jarvis_util.shell.ssh_exec import *
 from jarvis_util.shell.pssh_exec import *
 from jarvis_util.shell.process import *
 from jarvis_util.shell.pscp import *
+from jarvis_util.shell.slurm_exec import *
 from jarvis_util.shell.scp import *
+from jarvis_util.shell.compile import *
 from jarvis_util.shell.mpi_exec import *
 from jarvis_util.shell.local_exec import *
 from jarvis_util.introspect.system_info import *
+from jarvis_util.introspect.monitor import *
 from jarvis_util.jutil_manager import *

jarvis_util/introspect/monitor.py

@@ -1,3 +1,5 @@
+from jarvis_util.shell.exec import Exec
+
 class Callgrind(Exec):
  def __init__(self, cmd, exec_info=None):
  super().__init__(f'valgrind --tool=callgrind {cmd}')

jarvis_util/shell/compile.py

@@ -4,7 +4,7 @@
 from .filesystem import Mkdir
 
 class Cmake(Exec):
- def __init__(self, root_dir, out_dir, opts, exec_info):
+ def __init__(self, root_dir, out_dir, opts=None, exec_info=None):
  """
  Run cmake
 
@@ -13,6 +13,8 @@ def __init__(self, root_dir, out_dir, opts, exec_info):
  :param opts: A dict mapping cmake keys to values
  :param exec_info: The execution info
  """
+ if exec_info is None:
+ exec_info = LocalExecInfo()
  self.opts = opts
  self.root_dir = root_dir
  self.out_dir = out_dir
@@ -26,11 +28,15 @@ def __init__(self, root_dir, out_dir, opts, exec_info):
  else:
  self.cmd.append(f'-D{key}=OFF')
  else:
- self.cmd.append(f'-D{key}:{val}')
+ self.cmd.append(f'-D{key}={val}')
+ self.cmd = ' '.join(self.cmd)
  super().__init__(self.cmd, exec_info.mod(cwd=self.out_dir))
 
 class Make(Exec):
- def __init__(selfs, build_dir, nthreads, install, exec_info):
+ def __init__(selfs, build_dir, nthreads=8, install=False,
+ exec_info=None):
+ if exec_info is None:
+ exec_info = LocalExecInfo()
  if install:
  cmd = f'make -j{nthreads} install'
  else: