From 6347c38a5300cf62ede8d8489a51a6289ac04616 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 5 Nov 2024 14:49:11 +0100 Subject: [PATCH 1/4] Update README.md --- INSTALL-McStas/conda/README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/INSTALL-McStas/conda/README.md b/INSTALL-McStas/conda/README.md index bb0f8ac18a..510157b846 100644 --- a/INSTALL-McStas/conda/README.md +++ b/INSTALL-McStas/conda/README.md @@ -7,14 +7,21 @@ Due to the complex [licensing situation](https://discuss.scientific-python.org/t * [miniforge](https://github.com/conda-forge/miniforge) or * [micromamba](https://mamba.readthedocs.io/en/latest/user_guide/micromamba.html) -## Optionally create a dedicated environment and load it +## If you ALREADY have a conda (be it Anaconda, blah-conda or whatever) +* Initially, list mcstas version on conda-forge, just to be sure you pick them up: +* ```conda search mcstas --channel conda-forge```, should give you many lines of the form +* ```mcstas 3.5.8 hce30654_1 conda-forge ``` +* To install McStas with all needed dependencies, run +* ```conda create --name mcstas --channel conda-forge --channel nodefaults mcstas``` + +## If you DON'T have a conda already: + +### Optionally create a dedicated environment and load it * ```conda create --name mcstas ``` * ```conda activate mcstas``` -## Install McStas, compilers, openmpi -* ```mamba install mcstas compilers openmpi=4``` - -(From next McStas release newer openmpi versions are also OK, but the 3.5.1 version of mcrun has an issue with openmpi 5.x) +### Install McStas, compilers, openmpi +* ```mamba install mcstas``` ## Note for use on Windows At the time of release for 3.5.1 MCPL and NCrystal are not yet available for Windows on conda-forge, so related instruments will not compile/function. From 39beadaf7443798899f254145fc944dfad2f775e Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 5 Nov 2024 14:53:32 +0100 Subject: [PATCH 2/4] Update README.md --- INSTALL-McXtrace/conda/README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/INSTALL-McXtrace/conda/README.md b/INSTALL-McXtrace/conda/README.md index 80d776f1c0..2777e8b2b2 100644 --- a/INSTALL-McXtrace/conda/README.md +++ b/INSTALL-McXtrace/conda/README.md @@ -7,15 +7,22 @@ Due to the complex [licensing situation](https://discuss.scientific-python.org/t * [miniforge](https://github.com/conda-forge/miniforge) or * [micromamba](https://mamba.readthedocs.io/en/latest/user_guide/micromamba.html) -## Optionally create a dedicated environment and load it +## If you ALREADY have a conda (be it Anaconda, blah-conda or whatever) +* Initially, list mcstas version on conda-forge, just to be sure you pick them up: +* ```conda search mcxtrace --channel conda-forge```, should give you many lines of the form +* ```mcxtrace 3.5.8 hce30654_1 conda-forge ``` +* To install McStrace with all needed dependencies, run +* ```conda create --name mcxtrace --channel conda-forge --channel nodefaults mcxtrace``` + +## If you DON'T have a conda already: + +### Optionally create a dedicated environment and load it * ```conda create --name mcxtrace ``` * ```conda activate mcxtrace``` -## Install McXtrace, compilers, openmpi -* ```mamba install mcxtrace compilers openmpi=4``` - -(From next McXtrace release newer openmpi versions are also OK, but the 3.5.1 version of mcrun has an issue with openmpi 5.x) - +### Install McStas, compilers, openmpi +* ```mamba install mcxtrace``` + ## Note for use on Windows At the time of release for 3.5.1 MCPL is notr yet available for Windows on conda-forge, so related instruments will not compile/function. We expect this dependency to become available during the fall/winter of 2024. From dc271b9a37f97d5a0b7b6053650ba53e942e11a6 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 5 Nov 2024 14:54:03 +0100 Subject: [PATCH 3/4] Update README.md --- INSTALL-McXtrace/conda/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL-McXtrace/conda/README.md b/INSTALL-McXtrace/conda/README.md index 2777e8b2b2..a1dd110292 100644 --- a/INSTALL-McXtrace/conda/README.md +++ b/INSTALL-McXtrace/conda/README.md @@ -8,7 +8,7 @@ Due to the complex [licensing situation](https://discuss.scientific-python.org/t * [micromamba](https://mamba.readthedocs.io/en/latest/user_guide/micromamba.html) ## If you ALREADY have a conda (be it Anaconda, blah-conda or whatever) -* Initially, list mcstas version on conda-forge, just to be sure you pick them up: +* Initially, list mcstas versions available on conda-forge, just to be sure you pick them up: * ```conda search mcxtrace --channel conda-forge```, should give you many lines of the form * ```mcxtrace 3.5.8 hce30654_1 conda-forge ``` * To install McStrace with all needed dependencies, run From 08e3f28736c9c7f823b73d8a06ddbb7119baadb3 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 5 Nov 2024 14:54:28 +0100 Subject: [PATCH 4/4] Update README.md --- INSTALL-McStas/conda/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL-McStas/conda/README.md b/INSTALL-McStas/conda/README.md index 510157b846..879c7173ec 100644 --- a/INSTALL-McStas/conda/README.md +++ b/INSTALL-McStas/conda/README.md @@ -8,7 +8,7 @@ Due to the complex [licensing situation](https://discuss.scientific-python.org/t * [micromamba](https://mamba.readthedocs.io/en/latest/user_guide/micromamba.html) ## If you ALREADY have a conda (be it Anaconda, blah-conda or whatever) -* Initially, list mcstas version on conda-forge, just to be sure you pick them up: +* Initially, list mcstas versions available on conda-forge, just to be sure you pick them up: * ```conda search mcstas --channel conda-forge```, should give you many lines of the form * ```mcstas 3.5.8 hce30654_1 conda-forge ``` * To install McStas with all needed dependencies, run