Python3 compatibility changes for Frontera

SCECcode · Jun 10, 2023 · 6ad010b · 6ad010b
1 parent e60e931
commit 6ad010b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bbp/comps/bbp_status.py b/bbp/comps/bbp_status.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 BSD 3-Clause License
 
@@ -64,16 +64,16 @@ class BBPStatus(object):
  ["GFORTRAN Version",
  "cat $BBP_DIR/src/gfortran.version", False],
  ["NumPy Version",
- "python -c 'from __future__ import print_function; import numpy; print(numpy.__version__);'",
+ "python3 -c 'from __future__ import print_function; import numpy; print(numpy.__version__);'",
  False],
  ["SciPy Version",
- "python -c 'from __future__ import print_function; import scipy; print(scipy.__version__);'",
+ "python3 -c 'from __future__ import print_function; import scipy; print(scipy.__version__);'",
  False],
  ["Matplotlib Version",
- "python -c 'from __future__ import print_function; import matplotlib; print(matplotlib.__version__);'",
+ "python3 -c 'from __future__ import print_function; import matplotlib; print(matplotlib.__version__);'",
  False],
  ["PyProj Version",
- "python -c 'from __future__ import print_function; import pyproj; print(pyproj.__version__);'",
+ "python3 -c 'from __future__ import print_function; import pyproj; print(pyproj.__version__);'",
  False]]
 
  # Leave some envrionment variables out, to avoid capturing too much

diff --git a/bbp/comps/run_bbp.py b/bbp/comps/run_bbp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 BSD 3-Clause License
 

diff --git a/bbp/utils/batch/bbp_discovery_validation.py b/bbp/utils/batch/bbp_discovery_validation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 BSD 3-Clause License
 

diff --git a/bbp/utils/batch/run_parallel.py b/bbp/utils/batch/run_parallel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 BSD 3-Clause License
 
@@ -90,7 +90,7 @@ def runMultiSSH(self, nodes, numcores, cmdlist):
  if not "TMPDIR" in os.environ:
  os.environ["TMPDIR"] = ("/tmp/%s" %
  (os.environ["SLURM_JOB_ID"]))
- cmd = "/usr/bin/ssh -o \"ServerAliveInterval 60\" %s \"/bin/sh -c \'TMPDIR=%s;SLURM_JOB_ID=%s;source %s;%s\'\"" % (node, os.environ["TMPDIR"], os.environ["SLURM_JOB_ID"], self.envscript, c)
+ cmd = "/usr/bin/ssh -o \"ServerAliveInterval 60\" %s \"/bin/bash -c \'TMPDIR=%s;SLURM_JOB_ID=%s;source %s;%s\'\"" % (node, os.environ["TMPDIR"], os.environ["SLURM_JOB_ID"], self.envscript, c)
  print("Running on %s: %s" % (node, cmd))
  proclist.append([subprocess.Popen(cmd,shell=True), node])
  # Ensure unique simids