diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake index 79faa03d44..c2e9e8d117 100644 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake +++ b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake @@ -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 "") diff --git a/src/conf.py b/src/conf.py index 6df2c71781..1399fbd481 100644 --- a/src/conf.py +++ b/src/conf.py @@ -20,15 +20,6 @@ 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() @@ -36,7 +27,7 @@ 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