Add python38-<compiler>-ohpc and refactor Conda, Mamba, and SHPC #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
This takes advantage of the %{?_smp_mflags} macro to speed up build
times on machines with available resources.
Signed-off-by: Sol Jerome <solj@utdallas.edu>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
This disables the fetching of expected dependencies via git. The dependency consists of a single file so we just include the file instead. Signed-off-by: Sol Jerome <solj@utdallas.edu>
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
…ion-spec-files into add-python38
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
georgiastuart
changed the title
4 tasks
Signed-off-by: Georgia Stuart <georgia.stuart@gmail.com>
solj
approved these changes
Feb 14, 2023
|
|
||
| # Install conda | ||
| python3.8 setup.py install --prefix=%{buildroot}%{install_path} --install-scripts=%{buildroot}%{install_path}/bin | ||
| python3.8 -m pip install . --no-deps --no-build-isolation --prefix="%{buildroot}%{install_path}" |
There was a problem hiding this comment.
Suggested change
| python3.8 -m pip install . --no-deps --no-build-isolation --prefix="%{buildroot}%{install_path}" | |
| python3.8 -m pip install . --no-deps --no-build-isolation --prefix="%{buildroot}%{install_path}" |
| %{__cp} -r conda_package_handling/lib/python%{python3_version}/site-packages/conda_package_handling %{buildroot}/%{install_path}/lib/python%{python3_version}/site-packages/ | ||
|
|
||
| # Set up source files | ||
| # TODO: FIX csh FILE | ||
| %{__mkdir_p} %{buildroot}/%{install_path}/etc/profile.d | ||
| install -m 0644 -Dt %{buildroot}/%{install_path}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh} | ||
| sed -i '1s|^|export CONDA_EXE="%{install_path}/bin/conda"\nexport _CE_M=""\nexport _CE_CONDA=""\nexport CONDA_PYTHON_EXE="/usr/bin/python%{python3_version}"\n\n|' %{buildroot}/%{install_path}/etc/profile.d/conda.sh | ||
| sed -i '1s|^|export CONDA_EXE="%{install_path}/bin/conda"\nexport _CE_M=""\nexport _CE_CONDA=""\nexport CONDA_PYTHON_EXE="/opt/ohpc/pub/apps/gnu9/python38/3.8.15/bin/python3.8"\n\n|' %{buildroot}/%{install_path}/etc/profile.d/conda.sh |
There was a problem hiding this comment.
Perhaps we should use the python version variables here to make upgrading python more seamless?
| @@ -157,6 +167,8 @@ source_sh("bash", "%{install_path}/etc/profile.d/conda.sh") | |||
| -- source_sh("csh", "%{install_path}/etc/profile.d/conda.csh") | |||
| -- source_sh("tcsh", "%{install_path}/etc/profile.d/conda.csh") | |||
|
|
|||
| depends_on('python38') | |||
There was a problem hiding this comment.
Maybe add a python module variable?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a Python executable and library OHPC module (default 3.8) and refactors the Conda, Mamba, and SHPC spec files to rely on this new module rather than system python3.8.