Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RTD build fix. #329

Merged
merged 2 commits into from
Feb 10, 2025
Merged

RTD build fix. #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e30edb3
No longer need to reconfigure RTD file for documentation.
mdavis36 Feb 7, 2025
919ec6b
Fix ruby command line opts
ldowen Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab/machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py.in → docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/spheral_ats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down