fix devito version and update environ vars

slimgroup · Aug 12, 2020 · d6b8849 · d6b8849
1 parent 2ea3a9e
commit d6b8849
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/AzureBatch/docker/base_image/Dockerfile b/src/AzureBatch/docker/base_image/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get install -y htop vim git-core
 # Devito
 RUN apt-get install -y python3 python3-pip
 RUN pip3 install --upgrade pip
-RUN pip3 install --upgrade git+https://github.com/opesci/devito.git
+RUN git clone https://github.com/devitocodes/devito.git && cd devito && git checkout c1c8caf && pip install ./
 RUN pip3 install mpi4py matplotlib
 
 # clean

diff --git a/src/AzureBatch/docker/tti_image/Dockerfile b/src/AzureBatch/docker/tti_image/Dockerfile
@@ -1,7 +1,7 @@
 FROM devito_azure_base:v1.0
 
 # Install storage queue
-RUN pip3 install azure-storage-blob h5py segyio boto3
+RUN pip3 install azure-storage-blob==2.1.0 h5py segyio boto3
 RUN pip3 install azure-storage
 
 # Current sympy bug -> force version 1.5

diff --git a/src/AzureBatch/shipyard/config_gcc/jobs.yaml b/src/AzureBatch/shipyard/config_gcc/jobs.yaml
@@ -9,7 +9,7 @@ job_specifications:
       DEVITO_ARCH: gcc
       OMP_NUM_THREADS: 16
       DEVITO_MPI: 'basic'
-      DEVITO_OPENMP: 1
+      DEVITO_LANGUAGE: 'openmp'
       OMP_PROC_BIND: 'close'
       OMP_PLACES: 'cores'
       DEVITO_LOGGING: 'PERF'

diff --git a/src/AzureBatch/shipyard/config_hb120/jobs.yaml b/src/AzureBatch/shipyard/config_hb120/jobs.yaml
@@ -9,7 +9,7 @@ job_specifications:
       DEVITO_ARCH: gcc
       OMP_NUM_THREADS: 4
       DEVITO_MPI: 'basic'
-      DEVITO_OPENMP: 1
+      DEVITO_LANGUAGE: 'openmp'
       OMP_PROC_BIND: 'close'
       OMP_PLACES: 'cores'
       DEVITO_LOGGING: 'DEBUG'