Merge branch 'develop'

deephealthproject · Mar 3, 2021 · 362305f · 362305f
2 parents 0cbe92f + ddd2c1a
commit 362305f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libs/ecvl-toolkit.Dockerfile b/libs/ecvl-toolkit.Dockerfile
@@ -30,6 +30,8 @@ RUN echo "\nBuilding ECVL library..." >&2 \
         -D ECVL_WITH_DICOM=ON \
         -D ECVL_BUILD_EDDL=ON \
         -D ECVL_GPU=ON \
+        -D CMAKE_CUDA_STANDARD=14 \
+        -D CMAKE_CUDA_STANDARD_REQUIRED=TRUE \
         .. \
     && make -j$(( $(nproc) < 24 ? $(nproc) : 24 )) \
     && echo "\n Installing ECVL library..." >&2 \

diff --git a/settings.conf b/settings.conf
@@ -28,12 +28,12 @@ DOCKER_LOGIN_DONE=true
 # ECVL repository
 ECVL_REPOSITORY=https://github.com/deephealthproject/ecvl.git
 ECVL_BRANCH=master
-ECVL_REVISION=252a97e
+ECVL_REVISION=ae8f9f3
 
 # PyECVL
 PYECVL_REPOSITORY=https://github.com/deephealthproject/pyecvl.git
 PYECVL_BRANCH=master
-PYECVL_REVISION=47dc026
+PYECVL_REVISION=e6c59b3
 
 # EDDL repository 
 EDDL_REPOSITORY=https://github.com/deephealthproject/eddl.git