diff --git a/.gitignore b/.gitignore index ec946d818c79be7ff4c6d217ec369794d51d99c0..2933d05b9c8dfe71c496a2d89c7f2e6f85efcac5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ __pycache__/ out/ src/ summary/ -.miniconda2/ -Miniconda2-*-x86_64.sh \ No newline at end of file +.miniconda3/ +Miniconda3-*-x86_64.sh diff --git a/Dockerfile b/Dockerfile index da4258087149a94a25d6068759dc95201f40950b..46c1ced5bc74bb29b474b4dcc2a86ab416720eea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir /home/inteq/gigaqbx-2d-results WORKDIR /home/inteq/gigaqbx-2d-results COPY --chown=inteq . . RUN ./install.sh \ - && .miniconda2/bin/conda clean --all --yes + && .miniconda3/bin/conda clean --all --yes # Install extra LaTeX bits RUN tlmgr init-usertree \ diff --git a/README.md b/README.md index 13e358129a605d982ba62ab176f0f390643d3b48..be87829fc6954a175b638dabc47d2510025f615b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ For producing figures and outputs, you will also need LaTeX and the Before running, activate the Conda environment and instruct PyOpenCL to use POCL, as follows: ``` -source .miniconda2/bin/activate inteq +source .miniconda3/bin/activate inteq export PYOPENCL_TEST=portable ``` diff --git a/install.sh b/install.sh index 5fd91bcd530a33bc230f01c9f6243ee9438f6620..bab99eaf91b238c0d2005d41d8b4043624f05403 100755 --- a/install.sh +++ b/install.sh @@ -5,18 +5,18 @@ # Find platform if [ "$(uname)" = Darwin ] && [ "$(uname -m)" = x86_64 ] then - MINICONDA_INSTALL_SH=Miniconda2-4.7.10-MacOSX-x86_64.sh + MINICONDA_INSTALL_SH=Miniconda3-4.7.10-MacOSX-x86_64.sh SPEC_FILE=env/osx-64-spec.txt elif [ "$(uname)" = Linux ] && [ "$(uname -m)" = x86_64 ] then - MINICONDA_INSTALL_SH=Miniconda2-4.7.10-Linux-x86_64.sh + MINICONDA_INSTALL_SH=Miniconda3-4.7.10-Linux-x86_64.sh SPEC_FILE=env/linux-64-spec.txt else echo Unsupported platform. exit 1 fi -MINICONDA_INSTALL_DIR=.miniconda2 +MINICONDA_INSTALL_DIR=.miniconda3 if [ -d $MINICONDA_INSTALL_DIR ] && [ -d src ] then