From 1d7a0e87471c56da2802eda18085ae7daabf6e0a Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 19 Sep 2026 15:25:17 +0200 Subject: [PATCH 1/2] These config-profiles are no longer required after merge of #2672 --- .../McStas_8GPU/mccode_config.json | 41 ------------------- .../McXtrace_8GPU/mccode_config.json | 41 ------------------- 2 files changed, 82 deletions(-) delete mode 100644 tools/Python/mctest/mcstas-test/McStas_8GPU/mccode_config.json delete mode 100644 tools/Python/mctest/mcxtrace-test/McXtrace_8GPU/mccode_config.json diff --git a/tools/Python/mctest/mcstas-test/McStas_8GPU/mccode_config.json b/tools/Python/mctest/mcstas-test/McStas_8GPU/mccode_config.json deleted file mode 100644 index 498c6d1814..0000000000 --- a/tools/Python/mctest/mcstas-test/McStas_8GPU/mccode_config.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "configuration": { - "MCCODE_VERSION": "3.x-dev", - "TERMINAL": "x-terminal-emulator -e", - "MCCOGEN": "mcstas", - "MCCODE": "mcstas", - "MCRUN": "mcrun --openacc", - "MCPLOT": "mcplot-pyqtgraph", - "MCDISPLAY": "mcdisplay-webgl", - "TOOL_NAME": "mcgui", - "PARTICLE": "neutron", - "BROWSER": "xdg-open", - "GUICOLS": "3", - "EDITOR": "xdg-open", - "QSCI": "1", - "FORMAT": "McCode", - "IDFGEN": "mcdisplay-mantid", - "ISCONDAPKG": "1" - }, - "compilation": { - "CFLAGS": "-g -lm -O2 -std=c99", - "NEXUSFLAGS": "-Wl,-rpath,${CONDA_PREFIX}/lib -L${CONDA_PREFIX}/lib -DUSE_NEXUS -lNeXus -I${CONDA_PREFIX}/include/nexus", - "MPIFLAGS": "-DUSE_MPI -lmpi -Wl,-rpath,/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/lib -L,/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/lib -I/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/include", - "OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC", - "GSLFLAGS": "-Wl,-rpath,${CONDA_PREFIX}/lib -L${CONDA_PREFIX}/lib -lgsl -lgslcblas -I${CONDA_PREFIX}/include/", - "NCRYSTALFLAGS": "CMD(ncrystal-config --show buildflags)", - "MCPLFLAGS": "CMD(mcpl-config --show buildflags)", - "KDSOURCEFLAGS": "CMD(kdsource-config --show buildflags)", - "XRLFLAGS": "", - "CC": "gcc", - "OACC": "nvc", - "MPICC": "mpicc", - "MPIRUN": "mpirun", - "MPINODES": "8" - }, - "platform": { - "EXESUFFIX": "out" - }, - "directories": { - } -} diff --git a/tools/Python/mctest/mcxtrace-test/McXtrace_8GPU/mccode_config.json b/tools/Python/mctest/mcxtrace-test/McXtrace_8GPU/mccode_config.json deleted file mode 100644 index 4ffb7eb607..0000000000 --- a/tools/Python/mctest/mcxtrace-test/McXtrace_8GPU/mccode_config.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "configuration": { - "MCCODE_VERSION": "3.x-dev", - "TERMINAL": "x-terminal-emulator -e", - "MCCOGEN": "mcxtrace", - "MCCODE": "mcxtrace", - "MCRUN": "mxrun --openacc", - "MCPLOT": "mxplot-pyqtgraph", - "MCDISPLAY": "mxdisplay-webgl", - "TOOL_NAME": "mxgui", - "PARTICLE": "xray", - "BROWSER": "xdg-open", - "GUICOLS": "3", - "EDITOR": "xdg-open", - "QSCI": "1", - "FORMAT": "McCode", - "IDFGEN": "", - "ISCONDAPKG": "1" - }, - "compilation": { - "CFLAGS": "-g -lm -O2 -std=c99", - "NEXUSFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -DUSE_NEXUS -lNeXus -IGETPATH(miniconda3/include/nexus)", - "MPIFLAGS": "-DUSE_MPI -lmpi -Wl,-rpath,/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/lib -L,/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/lib -I/opt/nvidia/hpc_sdk/Linux_x86_64/25.9/comm_libs/12.9/openmpi4/openmpi-4.1.5/include", - "OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC", - "GSLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lgsl -lgslcblas -IGETPATH(miniconda3/include)", - "NCRYSTALFLAGS": "", - "MCPLFLAGS": "CMD(mcpl-config --show buildflags)", - "KDSOURCEFLAGS": "CMD(kdsource-config --show buildflags)", - "XRLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lxrl -IGETPATH(miniconda3/include)", - "CC": "gcc", - "OACC": "nvc", - "MPICC": "mpicc", - "MPIRUN": "mpirun", - "MPINODES": "8" - }, - "platform": { - "EXESUFFIX": "out" - }, - "directories": { - } -} From 43b912042bee2fc0f513c4f336bf8a3e2991532a Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 19 Sep 2026 15:27:40 +0200 Subject: [PATCH 2/2] Remove obsolete folder, info is under INSTALL-Mc*/conda --- conda-snips-windows/README.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 conda-snips-windows/README.md diff --git a/conda-snips-windows/README.md b/conda-snips-windows/README.md deleted file mode 100644 index f4b8b511f9..0000000000 --- a/conda-snips-windows/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Windows helper snippets for McStas/McXtrace -## Contents: - -### [mcstas-conda.bat](mcstas-conda.bat) -- Batch script for installing latest McStas via micromamba on Windows. -- Use Desktop link to get a McStas shell after installation - -### [mcxtrace-conda.bat](mcxtrace-conda.bat) -- Batch script for installing latest McXtrace via micromamba on Windows. -- Use Desktop link to get a McStas shell after installation -