diff --git a/README.md b/README.md index 3df0443..c555c9b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,12 @@ MCMC methods for neural networks. -eeyore can be installed using anaconda or pip. The anaconda installation does not include ODE modelling functionalilty based -on torchdiffeq. +eeyore can be installed using pip or anaconda. The anaconda installation does not include ODE modelling functionalilty based on torchdiffeq. + +To install eeyore using pip, run +``` +pip install eeyore +``` To install eeyore using anaconda, firstly add the required channels by running ``` @@ -18,8 +22,3 @@ To install eeyore using anaconda without adding any channels, run ``` conda install -c papamarkou -c pytorch -c conda-forge eeyore ``` - -To install eeyore using pip, run -``` -pip install eeyore -``` diff --git a/eeyore/__init__.py b/eeyore/__init__.py index b459ff2..4c744de 100644 --- a/eeyore/__init__.py +++ b/eeyore/__init__.py @@ -1 +1 @@ -__version__ = '0.0.12' +__version__ = '0.0.13' diff --git a/installation/anaconda.md b/installation/anaconda.md index 4cefde0..220d0c5 100644 --- a/installation/anaconda.md +++ b/installation/anaconda.md @@ -24,7 +24,7 @@ anaconda login ``` cd $HOME conda skeleton pypi eeyore -conda build --python 3.8 eeyore +conda build --python 3.6 eeyore ``` ### Upload to anaconda diff --git a/installation/dev.md b/installation/dev.md deleted file mode 100644 index 101963a..0000000 --- a/installation/dev.md +++ /dev/null @@ -1,31 +0,0 @@ -## For installation on local machine for development, assuming that conda is available - -``` -PKGNAME='eeyore' -PKGDIR="${HOME}/opt/python/packages" -PYBIN='python3' - -conda update conda -conda update --all - -conda create -n ${PKGNAME} python=3.8 - -conda activate ${PKGNAME} - -conda install -c conda-forge numpy -conda install pytorch torchvision torchaudio cpuonly -c pytorch # Linux, Windows -conda install pytorch torchvision torchaudio -c pytorch # Mac -conda install -c conda-forge torchdiffeq - -# conda install -c conda-forge spyder - -cd ${PKGDIR} -git clone git@github.com:papamarkou/kanga.git -cd kanga -${PYBIN} setup.py develop --user - -cd ${PKGDIR} -git clone git@github.com:papamarkou/${PKGNAME}.git -cd ${PKGNAME} -${PYBIN} setup.py develop --user -``` diff --git a/installation/dev.sh b/installation/dev.sh new file mode 100644 index 0000000..16ad309 --- /dev/null +++ b/installation/dev.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# Start up script for setting up environment on Ubuntu 20.04 LTS + +export PKGNAME='eeyore' +export PYVERSION='3.6' +export CONDADIR="$HOME/opt/continuum/miniconda/miniconda3" +export PYPKGDIR="$HOME/opt/python/packages" +export CONDABIN="$CONDADIR/bin/conda" +export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh' +export PKGURL="https://github.com/papamarkou/$PKGNAME.git" + +sudo apt-get update + +sudo apt-get install tree + +wget https://repo.anaconda.com/miniconda/$CONDASCRIPT +chmod u+x $CONDASCRIPT + +$SHELL $CONDASCRIPT -b -p $CONDADIR + +$CONDABIN create -n $PKGNAME -y python=$PYVERSION + +$CONDABIN init $(basename $SHELL) +$CONDABIN config --set auto_activate_base false + +mkdir -p $PYPKGDIR +cd $PYPKGDIR +git clone $PKGURL +cd $PKGNAME +python setup.py develop --user + +rm $CONDASCRIPT diff --git a/installation/gcloud.sh b/installation/gcloud.sh index cb7a98d..47f483c 100755 --- a/installation/gcloud.sh +++ b/installation/gcloud.sh @@ -9,4 +9,4 @@ gcloud compute instances create \ --image-family=ubuntu-2004-lts \ --no-restart-on-failure \ --maintenance-policy=terminate \ - --metadata-from-file startup-script=gstartup.sh + --metadata-from-file startup-script=gdev.sh diff --git a/installation/gdev.sh b/installation/gdev.sh new file mode 100644 index 0000000..0548ccd --- /dev/null +++ b/installation/gdev.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# Start up script for setting up environment on Ubuntu 20.04 LTS + +export METAUSER='theodore' +export BASEDIR="/home/$METAUSER" +export PKGNAME='eeyore' +export PYVERSION='3.6' +export CONDADIR="$HOME/opt/continuum/miniconda/miniconda3" +export PYPKGDIR="$HOME/opt/python/packages" +export CONDABIN="$CONDADIR/bin/conda" +export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh' +export PKGURL="https://github.com/papamarkou/$PKGNAME.git" + +sudo apt-get update + +sudo apt-get install tree + +su - $METAUSER -c "wget https://repo.anaconda.com/miniconda/$CONDASCRIPT" +su - $METAUSER -c "chmod u+x $CONDASCRIPT" + +su - $METAUSER -c "$SHELL $CONDASCRIPT -b -p $CONDADIR" + +su - $METAUSER -c "$CONDABIN create -n $PKGNAME -y python=$PYVERSION" + +su - $METAUSER -c "$CONDABIN init $(basename $SHELL)" +su - $METAUSER -c "$CONDABIN config --set auto_activate_base false" + +su - $METAUSER -c "mkdir -p $PYPKGDIR; +cd $PYPKGDIR; +git clone $PKGURL; +cd $PKGNAME; +$CONDABIN activate $PKGNAME; +python setup.py develop --user" + +rm $CONDASCRIPT diff --git a/installation/gstartup.sh b/installation/gstable.sh similarity index 83% rename from installation/gstartup.sh rename to installation/gstable.sh index 7dc5871..de8e1b2 100755 --- a/installation/gstartup.sh +++ b/installation/gstable.sh @@ -2,15 +2,12 @@ # Start up script for setting up environment on Ubuntu 20.04 LTS -METAUSER='theodore' -BASEDIR="/home/$METAUSER" - +export METAUSER='theodore' +export BASEDIR="/home/$METAUSER" export PKGNAME='eeyore' - +export PYVERSION='3.6' export CONDADIR="$BASEDIR/opt/continuum/miniconda/miniconda3" - export CONDABIN="$CONDADIR/bin/conda" - export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh' sudo apt-get update @@ -22,7 +19,7 @@ su - $METAUSER -c "chmod u+x $CONDASCRIPT" su - $METAUSER -c "$SHELL $CONDASCRIPT -b -p $CONDADIR" -su - $METAUSER -c "$CONDABIN create -n $PKGNAME -y -c papamarkou -c pytorch -c conda-forge python=3.8 $PKGNAME" +su - $METAUSER -c "$CONDABIN create -n $PKGNAME -y -c papamarkou -c pytorch -c conda-forge python=$PYVERSION $PKGNAME" su - $METAUSER -c "$CONDABIN init $(basename $SHELL)" su - $METAUSER -c "$CONDABIN config --set auto_activate_base false" diff --git a/installation/meta.yaml b/installation/meta.yaml index e2afedf..db051ef 100644 --- a/installation/meta.yaml +++ b/installation/meta.yaml @@ -1,5 +1,5 @@ {% set name = "eeyore" %} -{% set version = "0.0.12" %} +{% set version = "0.0.13" %} package: name: "{{ name|lower }}" diff --git a/installation/startup.sh b/installation/stable.sh similarity index 90% rename from installation/startup.sh rename to installation/stable.sh index 33de70a..4f37282 100755 --- a/installation/startup.sh +++ b/installation/stable.sh @@ -3,11 +3,9 @@ # Start up script for setting up environment on Ubuntu 20.04 LTS export PKGNAME='eeyore' - +export PYVERSION='3.6' export CONDADIR="$HOME/opt/continuum/miniconda/miniconda3" - export CONDABIN="$CONDADIR/bin/conda" - export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh' sudo apt-get update @@ -19,7 +17,7 @@ chmod u+x $CONDASCRIPT $SHELL $CONDASCRIPT -b -p $CONDADIR -$CONDABIN create -n $PKGNAME -y -c papamarkou -c pytorch -c conda-forge python=3.8 $PKGNAME +$CONDABIN create -n $PKGNAME -y -c papamarkou -c pytorch -c conda-forge python=$PYVERSION $PKGNAME $CONDABIN init $(basename $SHELL) $CONDABIN config --set auto_activate_base false