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.

Sign up for GitHub

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

Jump to bottom

Update main from release-2023.09.01 #462

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update main from release-2023.09.01 #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b72b354
create symlinks to /opt/saturncloud to preserve backwards compat
hhuuggoo Jan 24, 2024
29bea57
do not erase pyc files because it causes packages to fail conda verif…
hhuuggoo Jan 25, 2024
b5a8091
saturn-r-torch bump to cuda 11.8
hhuuggoo Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions common/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

set -ex
export PATH="${CONDA_BIN}:${PATH}"

cd $(dirname $0)

echo "installing root env:"
cat /tmp/environment.yml
mamba env update -n root -f /tmp/environment.yml
conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
rm -rf $HOME/.local

conda create -n saturn
2 changes: 1 addition & 1 deletion saturn-r-torch/postBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Set the cuda version for torch to use
sudo su -c "echo 'CUDA=11.6' >> /usr/local/lib/R/etc/Renviron"
sudo su -c "echo 'CUDA=11.8' >> /usr/local/lib/R/etc/Renviron"

# install other packages
Rscript -e "install.packages(c( \
Expand Down
1 change: 0 additions & 1 deletion saturnbase-julia-gpu-11.8/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
1 change: 0 additions & 1 deletion saturnbase-julia/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
1 change: 0 additions & 1 deletion saturnbase-python-gpu-11.8/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
1 change: 0 additions & 1 deletion saturnbase-python-gpu-12.1/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
1 change: 0 additions & 1 deletion saturnbase-python-gpu-devel-11.8/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
1 change: 0 additions & 1 deletion saturnbase-python-gpu-devel-12.1/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
3 changes: 3 additions & 0 deletions saturnbase-python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ ENV NB_PYTHON_PREFIX ${CONDA_DIR}/envs/saturn
ENV PATH ${NB_PYTHON_PREFIX}/bin:${CONDA_BIN}:${HOME}/.local/bin:${PATH}
WORKDIR ${HOME}
ENTRYPOINT []

RUN sudo ln -s /opt/saturncloud /opt/conda && \
sudo ln -s /opt/saturncloud /srv/conda
1 change: 0 additions & 1 deletion saturnbase-python/install-jupyter.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda clean -afy
jupyter lab clean
jlpm cache clean
npm cache clean --force
find ${CONDA_DIR}/ -type f,l -name '*.pyc' -delete
find ${CONDA_DIR}/ -type f,l -name '*.a' -delete
find ${CONDA_DIR}/ -type f,l -name '*.js.map' -delete
rm -rf $HOME/.node-gyp
Expand Down
9 changes: 9 additions & 0 deletions scripts/sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@ cp ./common/jupyter-gpu-environment.yml ./saturnbase-python-gpu-devel-11.8/envir
cp ./common/jupyter-gpu-environment.yml ./saturnbase-python-gpu-11.8/environment.yml
cp ./common/jupyter-gpu-environment.yml ./saturnbase-julia-gpu-11.8/environment.yml
cp ./common/jupyter-environment.yml ./saturnbase-julia/environment.yml


cp ./common/install-jupyter.bash ./saturnbase-python-gpu-devel-12.1/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-julia-gpu-11.8/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-python/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-julia/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-python-gpu-12.1/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-python-gpu-11.8/install-jupyter.bash
cp ./common/install-jupyter.bash ./saturnbase-python-gpu-devel-11.8/install-jupyter.bash