Merge pull request #721 from rtburns/c++17

Bump to C++17 and CMake 3.18, use conda spec file on CI

Author: rtburns-jpl

.cmake/ConfigISCE.cmake

@@ -19,30 +19,37 @@ if(CMAKE_VERSION VERSION_LESS 3.19)
 endif()
 
 # Check that compiler supports C++17
-# (Only checks GCC and Clang currently)
+# (Only checks GCC and AppleClang currently)
 function(CheckCXX)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
             message(FATAL_ERROR
-                "Insufficient GCC version - requires 6.0 or greater")
+                "Insufficient GCC version - requires 7.0 or greater")
         endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
             message(FATAL_ERROR
-                "Insufficient Clang version - requires 5.0 or greater")
+                "Insufficient AppleClang version - requires 5.0 or greater")
         endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     else()
         message(WARNING
             "Unsupported compiler detected - courageously continuing")
     endif()
 
-    # Require C++17 (no extensions) for host code
+    if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
+        if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11)
+            message(FATAL_ERROR
+                "NVCC 11+ required - detected ${CMAKE_CUDA_COMPILER_VERSION}")
+        endif()
+        # TODO: Can we check the CUDA host compiler here? We require GCC 7+
+    endif()
+
+    # Require C++17 (no extensions) for all C++ and CUDA code
     set(CMAKE_CXX_STANDARD            17 PARENT_SCOPE)
     set(CMAKE_CXX_STANDARD_REQUIRED   ON PARENT_SCOPE)
     set(CMAKE_CXX_EXTENSIONS         OFF PARENT_SCOPE)
-    # Require C++14 (no extensions) for device code
-    set(CMAKE_CUDA_STANDARD           14 PARENT_SCOPE)
+    set(CMAKE_CUDA_STANDARD           17 PARENT_SCOPE)
     set(CMAKE_CUDA_STANDARD_REQUIRED  ON PARENT_SCOPE)
     set(CMAKE_CUDA_EXTENSIONS        OFF PARENT_SCOPE)
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 
 include(${CMAKE_CURRENT_LIST_DIR}/.cmake/Isce3Version.cmake)
 isce3_get_version(ISCE3_VERSION_COMPONENTS ISCE3_VERSION_FULL)

doc/doxygen/install/centos.dox

@@ -10,7 +10,7 @@ ISCE3 has the following dependencies
 <li> Numpy
 <li> GDAL 2.3 or above with Python bindings
 <li> HDF5 1.10.2 or above with h5py
-<li> CMake 3.14 or above
+<li> CMake 3.18 or above
 <li> CUDA 9.0 or above (for GPU-based processing)
 <li> ruamel.yaml
 </ol>

doc/doxygen/install/osx.dox

@@ -9,7 +9,7 @@ ISCE has the following dependencies
 <li> Numpy
 <li> GDAL 2.3 or above with Python bindings
 <li> HDF5 1.10.2 or above with h5py
-<li> cmake 3.12 or above
+<li> CMake 3.18 or above
 <li> ruamel yaml for python3.7
 </ol>
 

extern/CMakeLists.txt

@@ -69,14 +69,15 @@ macro(getpackage_hdf5)
 
     # XXX This target is defined as INTERFACE rather than IMPORTED so it can be
     # exported in order to save downstream projects from having to redefine it.
-    add_library(hdf5 INTERFACE)
-    add_library(HDF5::HDF5 ALIAS hdf5)
-    set_target_properties(hdf5 PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}"
-        INTERFACE_LINK_LIBRARIES      "${HDF5_CXX_LIBRARIES}"
-        )
-
-    install(TARGETS hdf5 EXPORT isce3-targets)
+    if(NOT TARGET HDF5::HDF5)
+        add_library(hdf5 INTERFACE)
+        add_library(HDF5::HDF5 ALIAS hdf5)
+        set_target_properties(hdf5 PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}"
+            INTERFACE_LINK_LIBRARIES      "${HDF5_CXX_LIBRARIES}"
+            )
+        install(TARGETS hdf5 EXPORT isce3-targets)
+    endif()
 endmacro()
 
 macro(getpackage_openmp_optional)

python/extensions/pybind_isce3/CMakeLists.txt

@@ -6,15 +6,6 @@ include(Sources.cmake)
 set(ISCEEXTENSION pybind_isce3)
 pybind11_add_module(${ISCEEXTENSION} ${SRCS})
 
-# required c++ standard
-# XXX nominally, c++17 is experimentally supported but it produces a long list
-# XXX of awful compilation errors for me (w/ g++ v6.1)
-set_target_properties(${ISCEEXTENSION}
-    PROPERTIES
-        CXX_STANDARD 14
-        CXX_STANDARD_REQUIRED ON
-    )
-
 # include path
 target_include_directories(${ISCEEXTENSION} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..)
 

tools/README.md

@@ -60,3 +60,14 @@ After some local development, you can just rerun the build step - CMake will onl
 ```sh
 ./tools/run.py build
 ```
+
+#### Updating conda specfiles
+
+See [Building identical conda environments](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#building-identical-conda-environments)
+
+- Create a fresh conda environment
+- Install runtime dependencies from requirements.txt
+- `conda list --explicit > runtime/spec-file.txt`
+- Install dev dependencies from requirements.txt
+- `conda list --explicit > dev/spec-file.txt`
+- Make sure the dev dependencies are a superset of the runtime dependencies

tools/imagesets/centos7conda/dev/Dockerfile

@@ -14,13 +14,10 @@ RUN set -ex \
  && rm -rf /var/cache/yum \
  && rm -rf /var/cache/yum
 
-# Prefer installing from main, as forge is slow to resolve dependencies.
-COPY requirements.txt.main.dev  /tmp/requirements.txt.main
-COPY requirements.txt.forge.dev /tmp/requirements.txt.forge
-RUN conda install --yes -c main        --file /tmp/requirements.txt.main  \
- && conda install --yes -c conda-forge --file /tmp/requirements.txt.forge \
+COPY spec-file.txt /tmp/spec-file.txt
+RUN conda install --yes --file /tmp/spec-file.txt \
  && conda clean -tipsy \
  && rm -rf /opt/conda/pkgs \
- && rm /tmp/requirements.txt.{main,forge}
+ && rm /tmp/spec-file.txt
 
 ENV CUDAHOSTCXX=x86_64-conda_cos6-linux-gnu-g++

tools/imagesets/centos7conda/dev/requirements.txt.forge.dev

@@ -1 +1,2 @@
+cmake>=3.18
 gxx_linux-64

tools/imagesets/centos7conda/dev/requirements.txt.main.dev

@@ -1,4 +1,3 @@
-cmake
 eigen
 git
 ninja