Merge branch 'develop' into feature/improve_perf_analysis

Author: ldowen

.gitlab/machines.yml

@@ -27,7 +27,7 @@
     - batch
   variables:
     SCHEDULER_ACTION: allocate
-    SCHEDULER_PARAMETERS: "--res=ci --exclusive -N 2 -t 120"
+    SCHEDULER_PARAMETERS: "--reservation=ci --exclusive -N 2 -t 120"
     NPROC: 112
     HOSTNAME: 'ruby'
   timeout: 120 minutes

docs/CMakeLists.txt

@@ -9,16 +9,11 @@ if(ENABLE_DOCS)
   # HTML output directory
   set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html")
 
-  configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
-    "${BINARY_BUILD_DIR}/conf.py"
-    @ONLY)
-
   get_target_property(DOCS_ACTIVATE_VENV_CMD python_build_env ACTIVATE_VENV)
 
   add_custom_target(docs ALL
     COMMAND ${DOCS_ACTIVATE_VENV_CMD} && python -m sphinx -q -b html
-    -c "${BINARY_BUILD_DIR}"
+    -c "${CMAKE_CURRENT_SOURCE_DIR}"
     "${CMAKE_CURRENT_SOURCE_DIR}"
     "${SPHINX_HTML_DIR}"
     DEPENDS ${DOC_DEPENDS} python_build_env

docs/conf.py.in docs/conf.py

@@ -92,7 +92,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['@SPHINX_THEME_DIR@']  # ['_static']
+html_static_path = ['']  # ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

scripts/spheral_ats.py

@@ -99,7 +99,7 @@ def main():
     toss_machine_names = ["rzgenie", "rzwhippet", "rzhound", "ruby"] # Machines using Slurm scheduler
     toss_cray_machine_names = ["rzadams", "rzvernal", "tioga"] # Machines using Flux scheduler
     np_max_dict = {"rzadams": 84, "rzvernal": 64, "tioga": 64} # Maximum number of processors for ATS to use per node
-    ci_launch_flags = {"ruby": "--res=ci", "rzadams": "-q pdebug"}
+    ci_launch_flags = {"ruby": "--reservation=ci", "rzadams": "-q pdebug"}
     temp_uname = os.uname()
     hostname = temp_uname[1].rstrip("0123456789")
     sys_type = os.getenv("SYS_TYPE")