Skip to content

Commit

Permalink
Fix doxygen on ReadTheDocs (+ return to srun for MPI tests on tioga) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
bmhan12 authored Feb 1, 2023
1 parent 03d4c74 commit 19af5ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ set(MPI_CXX_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-

set(MPI_Fortran_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/bin/mpif90" CACHE PATH "")

set(MPIEXEC_EXECUTABLE "/usr/bin/flux" CACHE PATH "")
set(MPIEXEC_EXECUTABLE "srun" CACHE PATH "")

set(MPIEXEC_NUMPROC_FLAG "mini;run;-n" CACHE STRING "")
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")

set(ENABLE_MPI ON CACHE BOOL "")

Expand Down
11 changes: 1 addition & 10 deletions src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,14 @@
read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
if read_the_docs_build:

# Makes sure directory exists for doxygen output
cwd=os.getcwd()
buildpath=os.path.join(cwd,"_build")
if (os.path.isdir(buildpath) == 0):
os.mkdir(buildpath)
htmlpath=os.path.join(buildpath,"html")
if (os.path.isdir(htmlpath) == 0):
os.mkdir(htmlpath)

# Modify Doxyfile for ReadTheDocs compatibility
with open('./docs/doxygen/Doxyfile.in', 'r') as f:
fdata = f.read()
fdata = fdata.replace('@PROJECT_SOURCE_DIR@', '.')
with open('./docs/doxygen/Doxyfile.in', 'w') as f:
f.write(fdata)
with open('./docs/doxygen/Doxyfile.in', 'a') as f:
f.write("\nOUTPUT_DIRECTORY=./_build/html/doxygen")
f.write("\nOUTPUT_DIRECTORY=../_readthedocs/html/doxygen")

# Call doxygen
from subprocess import call
Expand Down

0 comments on commit 19af5ad

Please sign in to comment.