[cmake] More work

Author: Mathieu Taillefumier

.ci/uenv-recipes/tmlqcd/daint-gh200/repo/packages/lemonio/package.py

@@ -2,12 +2,13 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.build_systems import cmake
+from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 
 
 from spack.package import *
 
-class Lemonio(AutotoolsPackage):
+class Lemonio(AutotoolsPackage, CMakePackage):
     """LEMON: Lightweight Parallel I/O library for Lattice QCD."""
 
     homepage = "https://github.com/etmc/lemon"
@@ -16,13 +17,18 @@ class Lemonio(AutotoolsPackage):
 
     version('master', branch='master')
 
-    depends_on("autoconf", type="build", when="@master build_system=autotools")
-    depends_on("automake", type="build", when="@master build_system=autotools")
-    depends_on("libtool", type="build", when="@master build_system=autotools")
+    depends_on("libtool", type="build", when="@master build_system=cmake")
+    depends_on("cmake", type="build", when="master build_system=cmake")
 
     depends_on('mpi')
 
-    def configure_args(self):
-        args = []
-        args.append('CC={0}'.format(self.spec['mpi'].mpicc))
+    generator("ninja")
+
+class CMakeBuilder(cmake.CMakeBuilder):
+    def cmake_args(self):
+        spec = self.spec
+        args = [
+            self.define_from_variant("DBUILD_SHARED_LIBS" "shared"),
+        ]
         return args
+

.github/workflows/basic-build.yaml

@@ -61,20 +61,19 @@ jobs:
           repository: etmc/lemon
           path: lemon
 
-      - name: autogen_lemon
+      - name: create_builddir_lemon
         working-directory: ${{github.workspace}}/lemon
         run: |
-          autoreconf -i -f
           mkdir build
 
       - name: build_lemon
         working-directory: ${{github.workspace}}/lemon/build
         run: |
           CC=mpicc \
             CFLAGS="-march=haswell -mtune=haswell -O2" \
-            ../configure --prefix=$(pwd)/install_dir
+            cmake -DCMAKE_INSTALL_PREFIX=$(pwd)/install_dir ..
           make -j
-          make install
+          make install > config.log
       
       - name: Archive lemon config.log
         if: ${{ always() }}
@@ -92,28 +91,19 @@ jobs:
         shell: bash
         run: mkdir ${{github.workspace}}/main/build
 
-      - name: autogen_tmlqcd
-        working-directory: ${{github.workspace}}/main
-        run: autoconf
-
       - name: configure_and_build
         shell: bash
         working-directory: ${{github.workspace}}/main/build
         run: |
-          CC=mpicc CXX=mpicxx \
-            LDFLAGS="-fopenmp" \
             CFLAGS="-O2 -mtune=haswell -march=haswell -mavx2 -mfma -DOMPI_SKIP_MPICXX -fopenmp" \
             CXXFLAGS="-O2 -mtune=haswell -march=haswell -mavx2 -mfma -DOMPI_SKIP_MPICXX -fopenmp" \
-            ../configure \
-            --enable-mpi \
-            --with-mpidimension=4 \
-            --enable-omp \
-            --disable-sse2 \
-            --disable-sse3 \
-            --with-limedir=${{github.workspace}}/lime/build/install_dir \
-            --with-lemondir=${{github.workspace}}/lemon/build/install_dir \
-            --with-lapack="-lblas -llapack" || cat config.log
-          make -j
+            cmake -DCMAKE_PREFIX_PATH="${{github.workspace}}/lime/build/install_dir;${{github.workspace}}/lemon/build/install_dir" \
+            -DTM_USE_MPI=ON \
+            -DTM_USE_OMP=ON \
+            -DTM_USE_LEMON=ON \
+            .. > config.log
+            cat config.log
+            make -j
 
       - name: Archive tmLQCD config.log
         if: ${{ always() }}
@@ -125,7 +115,7 @@ jobs:
       - name: nf2_rgmixedcg_hmc_tmcloverdetratio
         working-directory: ${{github.workspace}}/main/build
         run: |
-          mpirun -np 2 ./hmc_tm \
+          mpirun -np 2 src/bin/hmc_tm \
             -f ../doc/sample-input/sample-hmc-rgmixedcg-tmcloverdetratio.input
       
       - name: Archive nf2_rgmixedcg_hmc_tmcloverdetratio output

CMakeLists.txt

@@ -23,9 +23,6 @@ endif()
 # =================================================================================================
 # PROJECT AND VERSION
 include(CMakeDependentOption)
-include(CheckSymbolExists)
-include(CheckLibraryExists)
-include(CheckFunctionExists)
 include(GNUInstallDirs)
 
 cmake_policy(SET CMP0048 NEW)
@@ -56,16 +53,18 @@ endif()
 
 find_package(PkgConfig)
 
-# ##############################################################################
-# Define the paths for static libraries and executables
-# ##############################################################################
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-    ${cp2k_BINARY_DIR}/lib
-    CACHE PATH "Single output directory for building all libraries.")
-
 # Search for rocm in common locations
-foreach(__var ROCM_ROOT CRAY_ROCM_ROOT ORNL_ROCM_ROOT CRAY_ROCM_PREFIX
-              ROCM_PREFIX CRAY_ROCM_DIR)
+foreach(
+  __var
+  ROCM_ROOT
+  HIP_ROOT
+  HIP_PATH
+  CRAY_ROCM_ROOT
+  ORNL_ROCM_ROOT
+  CRAY_ROCM_PREFIX
+  ROCM_PREFIX
+  CRAY_ROCM_DIR
+  ROCM_PATH)
   if($ENV{${__var}})
     list(APPEND CMAKE_PREFIX_PATH $ENV{__var})
     set(ROCM_PATH
@@ -75,7 +74,7 @@ foreach(__var ROCM_ROOT CRAY_ROCM_ROOT ORNL_ROCM_ROOT CRAY_ROCM_PREFIX
 endforeach()
 
 option(CMAKE_POSITION_INDEPENDENT_CODE "Enable position independent code" ON)
-option(BUILD_SHARED_LIBS "Enable shared library" ON)
+option(BUILD_SHARED_LIBS "Enable shared library" OFF)
 option(TM_USE_FFTW "Enable fftw support" OFF)
 option(TM_USE_MPI "Enable MPI support" OFF)
 option(TM_USE_CUDA "Enable QUDA support" OFF)
@@ -93,15 +92,13 @@ set(TM_ENABLE_ALIGNMENT
 set_property(CACHE TM_ENABLE_ALIGNMENT PROPERTY STRINGS "auto" "none" "16" "32"
                                                 "64")
 
-option(TM_BGL_DRAM "use BGL dram window (BGL only!)" ON)
 option(TM_USE_OPTIMIZATION "enable optimisation" ON)
 option(TM_USE_GAUGECOPY "Enable use of a copy of the gauge field" ON)
 option(TM_USE_HALFSPINOR "Use a Dirac Op. with halfspinor exchange" ON)
 option(TM_USE_TSPLITPAR "Enable timeslice-splitted communications" ON)
 option(TM_USE_QPHIX "enable QPhiX" OFF)
 option(TM_USE_SHMEM "Use shmem API" OFF)
 option(TM_USE_QUDA "Enable QUDA support" OFF)
-option(TM_USE_GPROF "Enable gprof profiler" OFF)
 option(TM_ENABLE_WARNINGS "Enable all warnings" ON)
 option(TM_ENABLE_TESTS "Enable tests" OFF)
 
@@ -203,7 +200,7 @@ if(TM_USE_HDF5)
 endif()
 
 if(TM_USE_LEMON)
-  find_package(Clemon REQUIRED)
+  find_package(lemon REQUIRED)
 endif()
 
 find_package(CLime REQUIRED)
@@ -231,18 +228,20 @@ endif()
 
 if(TM_USE_CUDA OR QUDA_TARGET_CUDA)
   enable_language(CUDA)
+
+  # placeholder for nvhpc for future use
   if(TM_USE_NVHPC)
     find_package(NVHPC REQUIRED COMPONENTS CUDA MATH HOSTUTILS NCCL)
   else()
     find_package(CUDAToolkit REQUIRED)
   endif()
 endif()
 
+# We may want to use hip-cuda for development or debugging purposes especially
+# if AMD GPU access is not possible. So allow it
+
 if(TM_USE_HIP OR QUDA_TARGET_HIP)
   enable_language(hip)
-
-  # we may want to use hip-cuda for development or debugging purposes especially
-  # if AMD GPU access is not possible. So allow it
   if(TM_USE_CUDA_HIP)
     find_package(CUDA)
   endif()
@@ -274,49 +273,34 @@ if(TM_USE_FFTW)
 endif()
 
 if(TM_USE_DDalphaAMG)
-  find_package(DDAlphaAMG REQUIRED)
-endif()
-
-# gprofiler
-
-if(TM_USE_GPROF)
-  set(PROFILE_FLAGS "-pg;-g")
-  if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc|powerpc64")
-    list(APPEND PROFILE_FLAGS "-qfullpath")
-  endif()
-  add_compile_options($<BOOL:$<COMPILE_LANGUAGE:C>:$PROFILE_FLAGS>)
+  find_package(DDalphaAMG REQUIRED)
 endif()
 
 if(TM_ENABLE_WARNINGS)
   add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wall>
                       $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wall>)
 endif()
 
-# check for the presence of clock_gettime in libc or librt
-check_symbol_exists(clock_gettime "time.h" TM_CLOCK_GETTIME)
-check_library_exists(rt clock_gettime "" TM_CLOCK_GETTIME_IN_RT)
-check_function_exists(fseeko TM_FSEEKO)
-
 # set the parallelization
 
 if(TM_USE_MPI)
-  if(TM_MPI_DIMENSION EQUAL "1")
+  if(TM_MPI_DIMENSION STREQUAL "1")
     # T parallelisation
     set(TM_PARALLELT ON)
-  elseif(TM_MPI_DIMENSION EQUAL "2")
+  elseif(TM_MPI_DIMENSION STREQUAL "2")
     # XT parallelisation
     set(TM_PARALLELXT ON)
-  elseif(TM_MPI_DIMENSION EQUAL "3")
+  elseif(TM_MPI_DIMENSION STREQUAL "3")
     set(TM_PARALLELXYT ON)
     # XYZ parallelisation
-  elseif(TM_MPI_DIMENSION EQUAL "4")
+  elseif(TM_MPI_DIMENSION STREQUAL "4")
     # timeslice-splitted communications
     set(TM_PARALLELXYZT ON)
-  elseif(TM_MPI_DIMENSION EQUAL "X")
+  elseif(TM_MPI_DIMENSION STREQUAL "X")
     set(TM_PARALLELX ON)
-  elseif(TM_MPI_DIMENSION EQUAL "XY")
+  elseif(TM_MPI_DIMENSION STREQUAL "XY")
     set(TM_PARALLELXY ON)
-  elseif(TM_MPI_DIMENSION EQUAL "XYZ")
+  elseif(TM_MPI_DIMENSION STREQUAL "XYZ")
     set(TM_PARALLELXYZ ON)
   else()
     set(TM_PARALLELXYZT ON)
@@ -346,7 +330,6 @@ if(DEFINED GIT_EXE AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
   message(STATUS "git hash ${TM_SHA}")
 else()
-  # set(TM_GIT_BRANCH "release v${SIRIUS_VERSION}")
   set(TM_SHA
       "https://github.com/etmc/tmLQCD/releases/tag/rel-${TMLQCD_VERSION_MAJOR}-${TMLQCD_VERSION_MINOR}"
   )

cmake/FindDDAlphaAMG.cmake

@@ -0,0 +1,28 @@
+include(FindPackageHandleStandardArgs)
+
+find_library(
+  TM_DDALPHAAMG_LIBRARIES
+  NAMES DDalphaAMG DDalphaAMG_devel
+  PATH_SUFFIXES "lib" "lib64")
+
+find_path(
+  TM_DDALPHAAMG_INCLUDE_DIRS
+  NAMES DDalphaAMG.h
+  PATH_SUFFIXES "include")
+
+find_package_handle_standard_args(
+  DDalphaAMG DEFAULT_MSG TM_DDALPHAAMG_LIBRARIES TM_DDALPHAAMG_INCLUDE_DIRS)
+
+if(TM_DDALPHAAMG_LIBRARIES
+   AND TM_DDALPHAAMG_INCLUDE_DIRS
+   AND NOT TARGET tmlqcd::DDalphaAMG)
+  message("INCLUDE: ${TM_DDALPHAAMG_INCLUDE_DIRS}")
+  add_library(tmlqcd::DDalphaAMG INTERFACE IMPORTED)
+  set_property(TARGET tmlqcd::DDalphaAMG PROPERTY INTERFACE_LINK_LIBRARIES
+                                                  "${TM_DDALPHAAMG_LIBRARIES}")
+  set_property(
+    TARGET tmlqcd::DDalphaAMG PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+                                       "${TM_DDALPHAAMG_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(TM_DDALPHAAMG_LIBRARIES TM_DDALPHAAMG_INCLUDE_DIRS)

cmake/FindDDalphaAMG.cmake

@@ -12,9 +12,6 @@
 /* Define to 1 if you have the `lemon' library (-llemon). */
 #cmakedefine TM_USE_LEMON 
 
-/* 1 if clock_gettime is available for use in benchmark */
-#cmakedefine TM_CLOCK_GETTIME 
-
 /* Compile with MPI support */
 #cmakedefine TM_USE_MPI
 
@@ -31,9 +28,9 @@
 #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "@PROJECT_DESCRIPTION@"
+#define PACKAGE_NAME "@tmlqcd_DESCRIPTION@"
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "@PROJECT_VERSION@"
+#define PACKAGE_STRING "@tmlqcd_VERSION@"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
@@ -65,9 +62,6 @@
 /* Fixed volume at compiletime */
 #cmakedefine TM_FIXEDVOLUME
 
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#cmakedefine TM_FSEEKO
-
 /* Alignment for arrays -- necessary for SSE and automated vectorization */
 #define ALIGN_BASE @ALIGN_BASE@