From 5c4d19a4e3673b26a1f881dd58a9d6f3cd27ab59 Mon Sep 17 00:00:00 2001 From: David Cottrell Date: Tue, 12 Dec 2023 17:40:21 +0000 Subject: [PATCH] update from bleepblop --- docker/Makefile | 5 +++++ golang/README.md | 5 +++-- golang/install.sh | 4 ---- my-gym | 2 +- python/local_setup.sh | 1 + python/pytorch.sh | 8 ++++---- ...ironment_minimal.pip => requirements_minimal.txt} | 3 +++ ...{environment_other.pip => requirements_other.pip} | 0 python/requirements_pytorch.txt | 1 + python/setup_conda.sh | 2 +- python/upgrade.sh | 12 ++++++------ tor/Makefile | 2 +- 12 files changed, 26 insertions(+), 19 deletions(-) delete mode 100644 golang/install.sh rename python/{environment_minimal.pip => requirements_minimal.txt} (93%) rename python/{environment_other.pip => requirements_other.pip} (100%) diff --git a/docker/Makefile b/docker/Makefile index 13629f82..14631904 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -13,3 +13,8 @@ prune: stop: sudo systemctl stop docker + + +ssh: + docker exec -it /bin/sh + diff --git a/golang/README.md b/golang/README.md index 87e8839d..379167ec 100644 --- a/golang/README.md +++ b/golang/README.md @@ -1,2 +1,3 @@ -go get github.com/d4l3k/go-pry -https://github.com/motemen/gore +# just download here + +https://go.dev/doc/install diff --git a/golang/install.sh b/golang/install.sh deleted file mode 100644 index ddeacf46..00000000 --- a/golang/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd /tmp -wget https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz -tar -xvzf go1.11.4.linux-amd64.tar.gz -# sudo mv go /usr/local diff --git a/my-gym b/my-gym index 9065d4fb..9f8446ad 160000 --- a/my-gym +++ b/my-gym @@ -1 +1 @@ -Subproject commit 9065d4fb82e30cf360f6d3730d86da9589b7f9f0 +Subproject commit 9f8446adf41acfb15664f70cbb14c2a166f328d3 diff --git a/python/local_setup.sh b/python/local_setup.sh index 74a5a04c..18ee2c1b 100755 --- a/python/local_setup.sh +++ b/python/local_setup.sh @@ -5,3 +5,4 @@ cd $HOME/projects/notebooks/extractors && $CMD cd $HOME/projects/notebooks/my-gym/toplevelrepo/our && $CMD cd $HOME/projects/notebooks/my-gym && $CMD cd $HOME/projects/notebooks/my-gym/my/gym/usr/cottrell/synthetic_data_generators && $CMD +cd $HOME/projects/notebooks/my-gym/my/gym/usr/cottrell/equinox_utils && $CMD diff --git a/python/pytorch.sh b/python/pytorch.sh index 3b1cffaa..defe817a 100755 --- a/python/pytorch.sh +++ b/python/pytorch.sh @@ -3,7 +3,7 @@ MY_CONDA_ENV=pytorch # PYTHON_ENV=3 PYTHON_ENV=3.11 conda create -c conda-forge -y -n $MY_CONDA_ENV python=$PYTHON_ENV -echo conda activate $MY_CONDA_ENV -echo pip install -U pip -echo pip install -r ./requirements_pytorch.txt -echo ./local_setup.sh +conda activate $MY_CONDA_ENV +pip install -U pip +pip install -r ./requirements_pytorch.txt +./local_setup.sh diff --git a/python/environment_minimal.pip b/python/requirements_minimal.txt similarity index 93% rename from python/environment_minimal.pip rename to python/requirements_minimal.txt index 3e69c18f..bddd734a 100644 --- a/python/environment_minimal.pip +++ b/python/requirements_minimal.txt @@ -33,3 +33,6 @@ duckdb prql-python jaxlib timeout-decorator +equinox +beartype +pdbpp diff --git a/python/environment_other.pip b/python/requirements_other.pip similarity index 100% rename from python/environment_other.pip rename to python/requirements_other.pip diff --git a/python/requirements_pytorch.txt b/python/requirements_pytorch.txt index 9301b4bb..f6035282 100644 --- a/python/requirements_pytorch.txt +++ b/python/requirements_pytorch.txt @@ -20,3 +20,4 @@ scikit-learn scipy tqdm ujson +pdbpp diff --git a/python/setup_conda.sh b/python/setup_conda.sh index e8e78401..10549d5b 100755 --- a/python/setup_conda.sh +++ b/python/setup_conda.sh @@ -9,7 +9,7 @@ type gcc || echo no gcc installed! # https://repo.anaconda.com/archive function install_conda() { if [[ $(uname) = "Linux" ]]; then - filename=Anaconda3-2022.10-Linux-x86_64.sh + filename=Anaconda3-2023.09-0-Linux-x86_64.sh else filename=Anaconda3-2022.10-MacOSX-x86_64.sh fi diff --git a/python/upgrade.sh b/python/upgrade.sh index 07e04542..94123110 100755 --- a/python/upgrade.sh +++ b/python/upgrade.sh @@ -1,16 +1,16 @@ #!/bin/bash pip install --upgrade pip -# ENV_FILE=environment.pip -ENV_FILE=environment_minimal.pip +# ENV_FILE=requirements.pip +ENV_FILE=requirements_minimal.pip # if [[ $(uname) = Darwin ]]; then if [[ $(hostname) != bleepblop ]]; then echo do not use GPU on this machine - cat $ENV_FILE | sed -e 's/tensorflow-gpu/tensorflow/' > /tmp/environment.pip - echo jax >> /tmp/environment.pip - # pip install -r /tmp/environment.pip -U # some conflicts causing issues - for x in $(cat /tmp/environment.pip); do + cat $ENV_FILE | sed -e 's/tensorflow-gpu/tensorflow/' > /tmp/requirements.pip + echo jax >> /tmp/requirements.pip + # pip install -r /tmp/requirements.pip -U # some conflicts causing issues + for x in $(cat /tmp/requirements.pip); do pip install -U $x done else diff --git a/tor/Makefile b/tor/Makefile index 3d60bd6c..53f72373 100644 --- a/tor/Makefile +++ b/tor/Makefile @@ -20,7 +20,7 @@ start: sudo service tor start stop: - sudo service tor start + sudo service tor stop restart: sudo service tor restart