Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install with ssh #181

Draft
wants to merge 24 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a53f52a
Install src pkgs with ssh.
MTCam Jul 19, 2023
c6833a7
Use ssh to install editable pkgs
MTCam Jul 19, 2023
bbb806f
Merge branch 'main' into install-with-ssh
MTCam Aug 28, 2023
c7d6f9c
Merge branch 'main' into install-with-ssh
MTCam Sep 29, 2023
e980c43
Merge branch 'main' into install-with-ssh
MTCam Jan 4, 2024
ebe403e
Merge branch 'main' into install-with-ssh
MTCam Apr 17, 2024
961b86e
Temporarily remove force option
MTCam Apr 17, 2024
8431dc4
Merge branch 'main' into mrgup
MTCam Apr 24, 2024
08e2ad8
Merge branch 'main' into install-with-ssh
MTCam Jun 11, 2024
d995146
version.sh: log installed packages
matthiasdiener Aug 22, 2024
389fc11
Merge remote-tracking branch 'origin/installed-packages' into install…
MTCam Aug 23, 2024
3c6be83
Update for tioga
MTCam Sep 4, 2024
b6760bc
:Merge branch 'main' into install-with-ssh
MTCam Oct 2, 2024
cbd8cc2
Merge branch 'main' into install-with-ssh
MTCam Nov 19, 2024
6596977
update for tuolumne
MTCam Jan 13, 2025
2714f33
Merge branch 'main' into install-with-ssh
Jan 29, 2025
d7deae7
Add odyssey@uo
Jan 29, 2025
dd9728d
Merge remote-tracking branch 'origin/install-with-ssh' into install-w…
MTCam Feb 3, 2025
9eb3bc4
Spell odyssey correctly
MTCam Feb 3, 2025
3615bfa
Update echos for amd systems
MTCam Feb 12, 2025
4023ef4
Merge branch 'main' into merge-main
MTCam Feb 12, 2025
aa4dfc6
Spell odyssey correctly
MTCam Feb 18, 2025
d5f97eb
Merge branch 'main' into install-with-ssh
matthiasdiener Feb 18, 2025
9e3692f
Merge branch 'main' into install-with-ssh
matthiasdiener Feb 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions install-pip-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,23 @@ if [[ $(mpicc --version) == "IBM XL"* ]]; then
exit 1
fi

switch_requirements_to_ssh() {
input_file="$1"
output_file="$2"

# Read the input file
while IFS= read -r line; do
# Check if the line starts with "git+https://github"
if [[ $line == *editable\ git+https://github* ]]; then
# Replace "git+https://github" with "git+ssh://git@github"
modified_line=${line//git+https:\/\/github/git+ssh:\/\/git@github}
echo "$modified_line"
else
echo "$line"
fi
done < "$input_file" > "$output_file"
}

# Install the packages from the requirements file
export MPI4PY_BUILD_CONFIGURE=1

if [[ $(hostname) == tioga* || $(hostname) == odyssey || $(hostname) == tuolumne* ]]; then
Expand All @@ -47,4 +62,7 @@ if [[ $(hostname) == tioga* || $(hostname) == odyssey || $(hostname) == tuolumne
pip install 'mpi4py>=4'
fi

pip install --src . -r "$requirements_file"
# Update the requirements file to use ssh for git cloning
switch_requirements_to_ssh $requirements_file ssh_requirements.txt
# Install the packages from the new requirements file
pip install --src . -r ssh_requirements.txt
5 changes: 2 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ if ! command -v mpicc &> /dev/null ;then
exit 2
fi


if [[ $(hostname) == tioga* || $(hostname) == odyssey || $(hostname) == tuolumne* ]]; then
if [[ -z $ROCM_PATH ]]; then
# ROCM_PATH is needed below to install the AMD OpenCL ICD link
echo "**** Error: No ROCM_PATH environment variable set."
echo "**** Please load the appropriate 'rocm' module."
echo "**** Please load the appropriate 'rocm' module for AMD platforms."
exit 3
else
echo "==== Using system ROCM at $ROCM_PATH"
Expand Down Expand Up @@ -66,7 +65,7 @@ conda_env_file=""
opt_modules=0

# Switch mirgecom to use ssh URL
opt_git_ssh=0
opt_git_ssh=1

# Skip cloning mirgecom
opt_skip_clone=0
Expand Down
2 changes: 0 additions & 2 deletions version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@ command -v rpm && echo "rpm -qa" && rpm -qa 2>/dev/null

set -e


echo
echo "*** OS modules"

command -v module && module --redirect list


echo
echo "*** Emirge git modules"

Expand Down
Loading