Merge branch 'hotfix/0.22.1'

* hotfix/0.22.1:
  Version 0.22.1
  ATLAS-314 Support older Eigen versions (e.g. 3.2.0)
  Fix tools/install-pgi.sh by updating the download URL

CHANGELOG.md

@@ -7,6 +7,11 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+## [0.22.1] - 2020-10-22
+### Fixed
+- Installation of PGI compilers via tools/install-pgi.sh
+- Allow dependency on older Eigen 3.2 which does not use CMake targets
+
 ## [0.22.0] - 2020-10-14
 ### Fixed
 - Feature INIT_SNAN was not working
@@ -245,6 +250,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## 0.13.0 - 2018-02-16
 
 [Unreleased]: https://github.com/ecmwf/atlas/compare/master...develop
+[0.22.1]: https://github.com/ecmwf/atlas/compare/0.22.0...0.22.1
 [0.22.0]: https://github.com/ecmwf/atlas/compare/0.21.0...0.22.0
 [0.21.0]: https://github.com/ecmwf/atlas/compare/0.20.2...0.21.0
 [0.20.2]: https://github.com/ecmwf/atlas/compare/0.20.1...0.20.2

VERSION

@@ -1 +1 @@
-0.22.0
+0.22.1

cmake/atlas-import.cmake.in

@@ -23,8 +23,9 @@ if( atlas_HAVE_FORTRAN )
 endif()
 
 ## Eigen3
-if( atlas_HAVE_EIGEN )
-  find_dependency( Eigen3 HINTS @Eigen3_DIR@ )
+set( Eigen3_HINT @Eigen3_DIR@ )
+if( atlas_HAVE_EIGEN AND Eigen3_HINT )
+  find_dependency( Eigen3 HINTS ${Eigen3_HINT} )
 endif()
 
 ## gridtools_storage

cmake/features/EIGEN.cmake

@@ -1,8 +1,12 @@
 ### Eigen
 
-set( Eigen3_NO_MODULE ON )
-ecbuild_find_package( NAME Eigen3 VERSION 3.3 QUIET )
 ecbuild_add_option( FEATURE EIGEN
                     DESCRIPTION "Use Eigen linear algebra library"
-                    CONDITION TARGET Eigen3::Eigen )
+                    REQUIRED_PACKAGES Eigen3 )
 
+if( HAVE_EIGEN AND NOT TARGET Eigen3::Eigen )
+    # This is the case for older Eigen versions (e.g. 3.2.0)
+    ecbuild_add_library( TARGET atlas_eigen3 TYPE INTERFACE )
+    target_include_directories( atlas_eigen3 INTERFACE ${EIGEN3_INCLUDE_DIRS} )
+    add_library( Eigen3::Eigen ALIAS atlas_eigen3 )
+endif()

tools/install-pgi.sh

@@ -12,6 +12,8 @@
 # See <https://creativecommons.org/publicdomain/zero/1.0/> for
 # details.
 
+version=20.9
+
 TEMPORARY_FILES="${TMPDIR:-/tmp}"
 export NVHPC_INSTALL_DIR=$(pwd)/pgi-install
 export NVHPC_SILENT=true
@@ -26,6 +28,9 @@ while [ $# != 0 ]; do
     "--verbose")
         export NVHPC_SILENT=false;
         ;;
+    "--version")
+        version="$2"; shift
+        ;;
     *)   
         echo "Unrecognized argument '$1'"
         exit 1
@@ -43,7 +48,11 @@ case "$(uname -m)" in
 		;;
 esac
 
-URL="$(curl -s 'https://developer.nvidia.com/nvidia-hpc-sdk-download' | grep -oP "https://developer.download.nvidia.com/hpc-sdk/([0-9]{2}\.[0-9]+)/nvhpc_([0-9]{4})_([0-9]+)_Linux_$(uname -m)_cuda_([0-9\.]+).tar.gz" | sort | tail -1)"
+# Example download URL for version 20.9
+#    https://developer.download.nvidia.com/hpc-sdk/20.9/nvhpc_2020_209_Linux_x86_64_cuda_11.0.tar.gz
+
+ver="$(echo $version | tr -d . )"
+URL=$(curl -s "https://developer.nvidia.com/nvidia-hpc-sdk-$ver-downloads" | grep -oP "https://developer.download.nvidia.com/hpc-sdk/([0-9]{2}\.[0-9]+)/nvhpc_([0-9]{4})_([0-9]+)_Linux_$(uname -m)_cuda_([0-9\.]+).tar.gz" | sort | tail -1)
 FOLDER="$(basename "$(echo "${URL}" | grep -oP '[^/]+$')" .tar.gz)"
 
 if [ ! -z "${TRAVIS_REPO_SLUG}" ]; then