From c9c200bd386b2922d9f7574df8f57c3e0b7e30ef Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Thu, 18 Jan 2024 21:59:14 +0100 Subject: [PATCH] use native CMake variables for compiler flags --- .github/workflows/intel.yml | 2 +- .github/workflows/osx.yml | 2 +- .gitlab-ci.yml | 41 ++++++++----------------------------- .gitlab/scripts.yml | 6 ++---- .gitlab/variables.yml | 4 +--- CMakeLists.txt | 17 --------------- benchmark/CMakeLists.txt | 1 - cmake/create_test.cmake | 4 ---- core/CMakeLists.txt | 2 -- core/get_info.cmake | 2 -- core/mpi/get_info.cmake | 2 -- cuda/CMakeLists.txt | 2 -- cuda/get_info.cmake | 1 - dpcpp/CMakeLists.txt | 1 - hip/CMakeLists.txt | 2 -- omp/CMakeLists.txt | 1 - omp/get_info.cmake | 3 +-- reference/CMakeLists.txt | 1 - reference/get_info.cmake | 7 +++---- 19 files changed, 18 insertions(+), 83 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 5cd9b516b64..1d5597f678f 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -36,7 +36,7 @@ jobs: spack find --loaded mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=install_ginkgo -DGINKGO_COMPILER_FLAGS="-ffp-model=precise" -DCMAKE_CXX_COMPILER=${{ matrix.config.compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DGINKGO_MIXED_PRECISION=${{ matrix.config.mixed }} -DGINKGO_DPCPP_SINGLE_MODE=ON + cmake .. -DCMAKE_INSTALL_PREFIX=install_ginkgo -DGINKGO_COMPILER_FLAGS="-Wpedantic;-ffp-model=precise" -DCMAKE_CXX_COMPILER=${{ matrix.config.compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DGINKGO_MIXED_PRECISION=${{ matrix.config.mixed }} -DGINKGO_DPCPP_SINGLE_MODE=ON make -j8 ONEAPI_DEVICE_SELECTOR=level_zero:gpu ctest -j10 --output-on-failure diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index c805f8979e2..f5777be0160 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -53,7 +53,7 @@ jobs: run: | mkdir build cd build - cmake .. -DBUILD_SHARED_LIBS=${{ matrix.config.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DGINKGO_MIXED_PRECISION=${{ matrix.config.mixed }} + cmake .. -DCMAKE_CXX_FLAGS=-Wpedantic -DBUILD_SHARED_LIBS=${{ matrix.config.shared }} -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DGINKGO_MIXED_PRECISION=${{ matrix.config.mixed }} make -j8 ctest -j10 --output-on-failure diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab78943a409..7212e6fd8a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,6 @@ build/cuda101/nompi/clang/cuda_wo_omp/release/shared: - .full_test_condition - .use_gko-cuda101-openmpi-gnu8-llvm7-intel2019 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_CUDA: "ON" BUILD_HIP: "ON" @@ -138,7 +137,6 @@ build/cuda101/nompi/clang/all/release/static: - .full_test_condition - .use_gko-cuda101-openmpi-gnu8-llvm7-intel2019 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_CUDA: "ON" @@ -155,7 +153,6 @@ build/cuda101/nompi/clang/all/release/static: # - .quick_test_condition # - .use_gko-cuda101-openmpi-gnu8-llvm13-intel2019 # variables: -# C_COMPILER: "clang" # CXX_COMPILER: "clang++" # CUDA_COMPILER: "clang++" # BUILD_OMP: "ON" @@ -173,7 +170,6 @@ build/cuda101/nompi/clang/all/release/static: # - .full_test_condition # - .use_gko-cuda101-openmpi-gnu8-llvm13-intel2019 # variables: -# C_COMPILER: "clang" # CXX_COMPILER: "clang++" # CUDA_COMPILER: "clang++" # BUILD_OMP: "ON" @@ -209,7 +205,6 @@ build/cuda102/nompi/clang/all/release/static: - .full_test_condition - .use_gko-cuda102-nompi-gnu8-llvm8-intel2019 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_CUDA: "ON" @@ -225,8 +220,8 @@ build/cuda102/nompi/intel/cuda/debug/static: - .full_test_condition - .use_gko-cuda102-nompi-gnu8-llvm8-intel2019 variables: - C_COMPILER: "icc" CXX_COMPILER: "icpc" + CXX_FLAGS: "" BUILD_OMP: "ON" BUILD_CUDA: "ON" BUILD_TYPE: "Debug" @@ -277,7 +272,6 @@ build/cuda110/nompi/clang/cuda/release/static: - .full_test_condition - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_CUDA: "ON" @@ -312,8 +306,8 @@ build/cuda110/nompi/intel/cuda/debug/static: - .full_test_condition - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020 variables: - C_COMPILER: "icc" CXX_COMPILER: "icpc" + CXX_FLAGS: "" BUILD_OMP: "ON" BUILD_CUDA: "ON" BUILD_TYPE: "Debug" @@ -367,7 +361,6 @@ build/nvhpc233/cuda120/nompi/nvcpp/release/static: - .quick_test_condition - .use_gko_nvhpc233-cuda120-openmpi-gnu12-llvm16 variables: - C_COMPILER: "nvc" CXX_COMPILER: "nvc++" BUILD_OMP: "ON" BUILD_CUDA: "ON" @@ -387,7 +380,6 @@ build/nvhpc227/cuda117/nompi/nvcpp/debug/shared: - .quick_test_condition - .use_gko_nvhpc227-cuda117-openmpi-gnu11-llvm14 variables: - C_COMPILER: "nvc" CXX_COMPILER: "nvc++" BUILD_OMP: "ON" BUILD_CUDA: "ON" @@ -420,7 +412,6 @@ build/amd/nompi/clang/rocm45/release/static: - .full_test_condition - .use_gko-rocm45-nompi-gnu8-llvm8 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_HIP: "ON" @@ -435,7 +426,6 @@ build/amd/nompi/clang/rocm45/debug/shared: - .quick_test_condition - .use_gko-rocm45-nompi-gnu8-llvm8 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_HIP: "ON" @@ -463,7 +453,6 @@ build/amd/nompi/clang/rocm502/release/shared: - .quick_test_condition - .use_gko-rocm502-nompi-gnu11-llvm11 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_HIP: "ON" @@ -504,7 +493,6 @@ build/nocuda/nompi/clang/core/release/shared: - .quick_test_condition - .use_gko-nocuda-nompi-gnu9-llvm8 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_TYPE: "Release" @@ -525,7 +513,6 @@ build/nocuda/openmpi/clang/omp/debug/static: - .full_test_condition - .use_gko-nocuda-openmpi-gnu9-llvm8 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" MPI_AS_ROOT: "ON" @@ -553,7 +540,6 @@ build/nocuda-nomixed/nompi/clang/omp/release/static: - .full_test_condition - .use_gko-nocuda-mvapich2-gnu5-llvm39-intel2019 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_TYPE: "Release" @@ -580,7 +566,6 @@ build/nocuda-nomixed/nompi/clang/omp/debug/static: - .full_test_condition - .use_gko-nocuda-nompi-gnu9-llvm8 variables: - C_COMPILER: "clang" CXX_COMPILER: "clang++" BUILD_OMP: "ON" BUILD_TYPE: "Debug" @@ -594,10 +579,9 @@ build/dpcpp/2022-1/cpu/release/shared: - .quick_test_condition - .use_gko-oneapi-cpu variables: - C_COMPILER: "gcc" CXX_COMPILER: "dpcpp" + CXX_FLAGS: "-Wpedantic;-ffp-model=precise" BUILD_SYCL: "ON" - GKO_COMPILER_FLAGS: "-ffp-model=precise" BUILD_TYPE: "Release" BUILD_SHARED_LIBS: "ON" SYCL_DEVICE_FILTER: "*:cpu" @@ -613,10 +597,9 @@ build/dpcpp/igpu/release/shared: - .quick_test_condition - .use_gko-oneapi-igpu variables: - C_COMPILER: "gcc" CXX_COMPILER: "dpcpp" + CXX_FLAGS: "-Wpedantic;-ffp-model=precise" BUILD_SYCL: "ON" - GKO_COMPILER_FLAGS: "-ffp-model=precise" BUILD_TYPE: "Release" BUILD_SHARED_LIBS: "ON" DPCPP_SINGLE_MODE: "ON" @@ -630,10 +613,9 @@ build/dpcpp/igpu/release/shared: # - .full_test_condition # - .use_gko-oneapi-igpu # variables: -# C_COMPILER: "gcc" # CXX_COMPILER: "dpcpp" +# CXX_FLAGS: "-Wpedantic;-ffp-model=precise" # BUILD_SYCL: "ON" -# GKO_COMPILER_FLAGS: "-ffp-model=precise" # BUILD_TYPE: "Debug" # BUILD_SHARED_LIBS: "ON" # DPCPP_SINGLE_MODE: "ON" @@ -647,10 +629,9 @@ build/dpcpp/dgpu/release/static: - .full_test_condition - .use_gko-oneapi-igpu variables: - C_COMPILER: "gcc" CXX_COMPILER: "dpcpp" + CXX_FLAGS: "-Wpedantic;-ffp-model=precise" BUILD_SYCL: "ON" - GKO_COMPILER_FLAGS: "-ffp-model=precise" BUILD_TYPE: "Release" BUILD_SHARED_LIBS: "OF" DPCPP_SINGLE_MODE: "ON" @@ -663,10 +644,9 @@ build/dpcpp/level_zero_dgpu/release/shared: - .quick_test_condition - .use_gko-oneapi-dgpu variables: - C_COMPILER: "gcc" CXX_COMPILER: "dpcpp" + CXX_FLAGS: "-Wpedantic;-ffp-model=precise" BUILD_SYCL: "ON" - GKO_COMPILER_FLAGS: "-ffp-model=precise" BUILD_TYPE: "Release" DPCPP_SINGLE_MODE: "ON" ONEAPI_DEVICE_SELECTOR: "level_zero:gpu" @@ -678,10 +658,8 @@ build/icpx/level_zero_dgpu/release/shared: - .quick_test_condition - .use_gko-oneapi-dgpu variables: - C_COMPILER: "icx" CXX_COMPILER: "icpx" BUILD_SYCL: "ON" - GKO_COMPILER_FLAGS: "-ffp-model=precise" BUILD_TYPE: "Release" DPCPP_SINGLE_MODE: "ON" ONEAPI_DEVICE_SELECTOR: "level_zero:gpu" @@ -698,8 +676,7 @@ warnings: BUILD_OMP: "ON" BUILD_CUDA: "ON" BUILD_HIP: "ON" - CXX_FLAGS: "-Werror=pedantic -pedantic-errors" - GKO_COMPILER_FLAGS: "-Wpedantic" + CXX_FLAGS: "-Werror=pedantic;-pedantic-errors" allow_failure: yes # Ensure kernel modules do not depend on core @@ -836,7 +813,7 @@ gh-pages: # build docs - mkdir -p ${CI_JOB_NAME} && pushd ${CI_JOB_NAME} - cmake ${CI_PROJECT_DIR} - -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} + -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=ON ${EXTRA_CMAKE_FLAGS} -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_REFERENCE=OFF -DGINKGO_BUILD_OMP=OFF -DGINKGO_BUILD_CUDA=OFF diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml index 504aa7dad40..2a8cf8c7fc2 100644 --- a/.gitlab/scripts.yml +++ b/.gitlab/scripts.yml @@ -31,13 +31,12 @@ - if [[ "${BUILD_MPI}" == "ON" ]]; then MPI_STR=-DGINKGO_MPI_EXEC_SUFFIX=${MPI_SUFFIX}; fi - - export CC=${C_COMPILER} CXX=${CXX_COMPILER} CUDAHOSTCXX=${CXX_COMPILER} CUDACXX=${CUDA_COMPILER} + - export CXX=${CXX_COMPILER} CUDAHOSTCXX=${CXX_COMPILER} CUDACXX=${CUDA_COMPILER} - cmake ${CI_PROJECT_DIR}${CI_PROJECT_DIR_SUFFIX} -GNinja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ${EXTRA_CMAKE_FLAGS} ${CUDA_ARCH_STR} - -DGINKGO_COMPILER_FLAGS=${GKO_COMPILER_FLAGS} -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_REFERENCE=${BUILD_REFERENCE} -DGINKGO_BUILD_OMP=${BUILD_OMP} -DGINKGO_BUILD_CUDA=${BUILD_CUDA} -DGINKGO_BUILD_HIP=${BUILD_HIP} -DGINKGO_BUILD_SYCL=${BUILD_SYCL} @@ -77,12 +76,11 @@ - if [[ "${BUILD_MPI}" == "ON" ]]; then MPI_STR=-DGINKGO_MPI_EXEC_SUFFIX=${MPI_SUFFIX}; fi - - export CC=${C_COMPILER} CXX=${CXX_COMPILER} CUDAHOSTCXX=${CXX_COMPILER} CUDACXX=${CUDA_COMPILER} + - export CXX=${CXX_COMPILER} CUDAHOSTCXX=${CXX_COMPILER} CUDACXX=${CUDA_COMPILER} - cmake ${CI_PROJECT_DIR}${CI_PROJECT_DIR_SUFFIX} -GNinja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ${EXTRA_CMAKE_FLAGS} ${CUDA_ARCH_STR} - -DGINKGO_COMPILER_FLAGS=${GKO_COMPILER_FLAGS} -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_BUILD_REFERENCE=${BUILD_REFERENCE} -DGINKGO_BUILD_OMP=${BUILD_OMP} -DGINKGO_BUILD_CUDA=${BUILD_CUDA} -DGINKGO_BUILD_HIP=${BUILD_HIP} -DGINKGO_BUILD_SYCL=${BUILD_SYCL} diff --git a/.gitlab/variables.yml b/.gitlab/variables.yml index 6c75d60d069..53f0ba63a61 100644 --- a/.gitlab/variables.yml +++ b/.gitlab/variables.yml @@ -2,7 +2,6 @@ .default_variables: variables: BENCHMARK_SERVER: "FINECI" - C_COMPILER: "gcc" CXX_COMPILER: "g++" CUDA_COMPILER: "nvcc" BUILD_TYPE: "Debug" @@ -15,7 +14,6 @@ BUILD_HWLOC: "ON" BUILD_PAPI_SDE: "OFF" BUILD_MPI: "OFF" - GKO_COMPILER_FLAGS: "" MPI_AS_ROOT: "OFF" FAST_TESTS: "OFF" NONDEFAULT_STREAM: "OFF" @@ -23,7 +21,7 @@ MIXED_PRECISION: "ON" RUN_EXAMPLES: "OFF" CONFIG_LOG: "ON" - CXX_FLAGS: "" + CXX_FLAGS: "-Wpedantic" EXTRA_CMAKE_FLAGS: "" EXPORT_BUILD_DIR: "OFF" CI_PROJECT_DIR_SUFFIX: "" diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b08516e3e..1ae8e3b554a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,20 +51,6 @@ option(GINKGO_BENCHMARK_ENABLE_TUNING OFF) set(GINKGO_VERBOSE_LEVEL "1" CACHE STRING "Verbosity level. Put 0 to turn off. 1 activates a few important messages.") -if(MSVC) - set(GINKGO_COMPILER_FLAGS "" CACHE STRING - "Set the required CXX compiler flags, mainly used for warnings. Current default is ``") -elseif(GINKGO_BUILD_SYCL OR CMAKE_CXX_COMPILER MATCHES "dpcpp|icpx") - # For now always use `-ffp-model=precise` with DPC++. This can be removed when - # the floating point issues are fixed. - set(GINKGO_COMPILER_FLAGS "-Wpedantic;-ffp-model=precise" CACHE STRING - "Set the required CXX compiler flags, mainly used for warnings. Current default is `-Wpedantic;-ffp-model=precise`") -else() - set(GINKGO_COMPILER_FLAGS "-Wpedantic" CACHE STRING - "Set the required CXX compiler flags, mainly used for warnings. Current default is `-Wpedantic`") -endif() -set(GINKGO_CUDA_COMPILER_FLAGS "" CACHE STRING - "Set the required NVCC compiler flags, mainly used for warnings. Current default is an empty string") set(GINKGO_CUDA_ARCHITECTURES "Auto" CACHE STRING "A list of target NVIDIA GPU architectures. See README.md for more detail.") # the details of fine/coarse grain memory and unsafe atomic are available https://docs.olcf.ornl.gov/systems/crusher_quick_start_guide.html#floating-point-fp-atomic-operations-and-coarse-fine-grained-memory-allocations @@ -483,7 +469,6 @@ add_custom_target(test_install -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} # `--config cfg` is ignored by single-configuration generator. @@ -504,7 +489,6 @@ add_custom_target(test_exportbuild -S${GINKGO_TEST_EXPORTBUILD_SRC_DIR} -B${GINKGO_TEST_EXPORTBUILD_BIN_DIR} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} # `--config cfg` is ignored by single-configuration generator. @@ -522,7 +506,6 @@ add_custom_target(test_pkgconfig -S${GINKGO_TEST_PKGCONFIG_SRC_DIR} -B${GINKGO_TEST_PKGCONFIG_BIN_DIR} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} # `--config cfg` is ignored by single-configuration generator. diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 347ecec7699..6b8ce0687d6 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -76,7 +76,6 @@ function(ginkgo_add_single_benchmark_executable name use_lib_linops macro_def ty target_link_libraries(${name} mpi_timer) endif() target_compile_definitions("${name}" PRIVATE "${macro_def}") - target_compile_options("${name}" PRIVATE ${GINKGO_COMPILER_FLAGS}) ginkgo_benchmark_add_tuning_maybe("${name}") if("${use_lib_linops}") if (GINKGO_BUILD_CUDA) diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake index 51cfb87b49f..c2f5c1fb94f 100644 --- a/cmake/create_test.cmake +++ b/cmake/create_test.cmake @@ -33,7 +33,6 @@ function(ginkgo_set_test_target_properties test_target_name test_library_suffix) target_link_libraries(${test_target_name} PRIVATE ginkgo_gtest_main${test_library_suffix}) endif() target_compile_features(${test_target_name} PUBLIC cxx_std_14) - target_compile_options(${test_target_name} PRIVATE $<$:${GINKGO_COMPILER_FLAGS}>) target_include_directories(${test_target_name} PRIVATE ${Ginkgo_BINARY_DIR} ${set_properties_ADDITIONAL_INCLUDES}) target_link_libraries(${test_target_name} PRIVATE ginkgo GTest::GTest ${set_properties_ADDITIONAL_LIBRARIES}) endfunction() @@ -148,9 +147,6 @@ endfunction(ginkgo_create_cuda_test) function(ginkgo_create_cuda_test_internal test_name filename test_target_name) add_executable(${test_target_name} ${filename}) target_compile_definitions(${test_target_name} PRIVATE GKO_COMPILING_CUDA) - target_compile_options(${test_target_name} - PRIVATE - $<$:${GINKGO_CUDA_COMPILER_FLAGS}>) if(MSVC) target_compile_options(${test_target_name} PRIVATE diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 047d362e8dd..449b8da4584 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -111,8 +111,6 @@ endif() ginkgo_compile_features(ginkgo) -target_compile_options(ginkgo PRIVATE "${GINKGO_COMPILER_FLAGS}") - # add a namespace alias so Ginkgo can always be included as Ginkgo::ginkgo # regardless of whether it is installed or added as a subdirectory add_library(Ginkgo::ginkgo ALIAS ginkgo) diff --git a/core/get_info.cmake b/core/get_info.cmake index 7b55be2b2c2..82816715b50 100644 --- a/core/get_info.cmake +++ b/core/get_info.cmake @@ -1,7 +1,5 @@ ginkgo_print_module_header(${detailed_log} "Core") ginkgo_print_variable(${detailed_log} "BUILD_SHARED_LIBS") -ginkgo_print_variable(${detailed_log} "CMAKE_C_COMPILER") -ginkgo_print_flags(${detailed_log} "CMAKE_C_FLAGS") ginkgo_print_variable(${detailed_log} "CMAKE_CXX_COMPILER") ginkgo_print_flags(${detailed_log} "CMAKE_CXX_FLAGS") ginkgo_print_variable(${detailed_log} "CMAKE_GENERATOR") diff --git a/core/mpi/get_info.cmake b/core/mpi/get_info.cmake index 3217e1a0511..722fd9a1cfa 100644 --- a/core/mpi/get_info.cmake +++ b/core/mpi/get_info.cmake @@ -1,5 +1,4 @@ ginkgo_print_module_header(${detailed_log} "MPI") -ginkgo_print_variable(${detailed_log} "MPI_C_COMPILER") ginkgo_print_variable(${detailed_log} "MPI_CXX_COMPILER") ginkgo_print_variable(${detailed_log} "MPI_CXX_COMPILE_OPTIONS") ginkgo_print_variable(${detailed_log} "MPI_CXX_LINK_FLAGS") @@ -10,5 +9,4 @@ ginkgo_print_variable(${detailed_log} "MPIEXEC_EXECUTABLE") ginkgo_print_variable(${detailed_log} "MPIEXEC_MAX_NUMPROCS") ginkgo_print_variable(${detailed_log} "MPIEXEC_NUMPROC_FLAG") ginkgo_print_module_footer(${detailed_log} "MPI variables:") -ginkgo_print_variable(${detailed_log} "GINKGO_COMPILER_FLAGS") ginkgo_print_module_footer(${detailed_log} "") diff --git a/cuda/CMakeLists.txt b/cuda/CMakeLists.txt index 0e0ac23f558..cd5b85d712c 100644 --- a/cuda/CMakeLists.txt +++ b/cuda/CMakeLists.txt @@ -116,8 +116,6 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") endif() endif() -target_compile_options(ginkgo_cuda PRIVATE $<$:${GINKGO_CUDA_COMPILER_FLAGS}>) -target_compile_options(ginkgo_cuda PRIVATE $<$:${GINKGO_COMPILER_FLAGS}>) ginkgo_compile_features(ginkgo_cuda) target_compile_definitions(ginkgo_cuda PRIVATE GKO_COMPILING_CUDA) diff --git a/cuda/get_info.cmake b/cuda/get_info.cmake index eeadaf9725c..3c00b05e0b0 100644 --- a/cuda/get_info.cmake +++ b/cuda/get_info.cmake @@ -1,6 +1,5 @@ ginkgo_print_module_header(${detailed_log} "CUDA") ginkgo_print_variable(${detailed_log} "CMAKE_CUDA_ARCHITECTURES") -ginkgo_print_variable(${detailed_log} "GINKGO_CUDA_COMPILER_FLAGS") ginkgo_print_module_footer(${detailed_log} "CUDA variables:") ginkgo_print_variable(${detailed_log} "CMAKE_CUDA_COMPILER") ginkgo_print_variable(${detailed_log} "CMAKE_CUDA_COMPILER_VERSION") diff --git a/dpcpp/CMakeLists.txt b/dpcpp/CMakeLists.txt index c3a2eb17548..492e6fe3edd 100644 --- a/dpcpp/CMakeLists.txt +++ b/dpcpp/CMakeLists.txt @@ -98,7 +98,6 @@ target_compile_options(ginkgo_dpcpp PRIVATE "${GINKGO_DPCPP_FLAGS}") # If we would like to use SOURCES, please use the new files copied from GKO_UNIFIED_COMMON_SOURCES. # Otherwise, the source's properties will be changed by add_sycl_to_target gko_add_sycl_to_target(TARGET ginkgo_dpcpp) -target_compile_options(ginkgo_dpcpp PRIVATE "${GINKGO_COMPILER_FLAGS}") # Note: add MKL as PRIVATE not PUBLIC (MKL example shows) to avoid propagating # find_package(MKL) everywhere when linking ginkgo (see the MKL example # https://software.intel.com/content/www/us/en/develop/documentation/onemkl-windows-developer-guide/top/getting-started/cmake-config-for-onemkl.html) diff --git a/hip/CMakeLists.txt b/hip/CMakeLists.txt index 6cf4d056e83..ad106e123bc 100644 --- a/hip/CMakeLists.txt +++ b/hip/CMakeLists.txt @@ -130,8 +130,6 @@ if (GINKGO_HAVE_ROCTX) target_link_libraries(ginkgo_hip PRIVATE roc::roctx) endif() -target_compile_options(ginkgo_hip PRIVATE $<$:${GINKGO_COMPILER_FLAGS}>) - if(GINKGO_HIP_PLATFORM MATCHES "${HIP_PLATFORM_AMD_REGEX}") find_package(hip REQUIRED) # To save a bit of pain, we directly link against the `library` instead of diff --git a/omp/CMakeLists.txt b/omp/CMakeLists.txt index 49564dd4c4d..3c1ecfe4c4f 100644 --- a/omp/CMakeLists.txt +++ b/omp/CMakeLists.txt @@ -78,7 +78,6 @@ target_include_directories(ginkgo_omp PRIVATE "${OpenMP_CXX_INCLUDE_DIRS}") # and the compiler is unhappy with the quotation marks. separate_arguments(OpenMP_SEP_FLAGS NATIVE_COMMAND "${OpenMP_CXX_FLAGS}") target_compile_options(ginkgo_omp PRIVATE "${OpenMP_SEP_FLAGS}") -target_compile_options(ginkgo_omp PRIVATE "${GINKGO_COMPILER_FLAGS}") # Need to link against ginkgo_cuda for the `raw_copy_to(CudaExecutor ...)` method target_link_libraries(ginkgo_omp PRIVATE ginkgo_cuda) diff --git a/omp/get_info.cmake b/omp/get_info.cmake index 3dc866e13fc..81cc9a0c3b9 100644 --- a/omp/get_info.cmake +++ b/omp/get_info.cmake @@ -2,8 +2,7 @@ ginkgo_print_module_header(${detailed_log} "OpenMP") ginkgo_print_variable(${detailed_log} "OpenMP_CXX_FLAGS") ginkgo_print_variable(${detailed_log} "OpenMP_CXX_LIB_NAMES") ginkgo_print_variable(${detailed_log} "OpenMP_CXX_LIBRARIES") -ginkgo_print_module_footer(${detailed_log} "OMP variables:") -ginkgo_print_variable(${detailed_log} "GINKGO_COMPILER_FLAGS") +#ginkgo_print_module_footer(${detailed_log} "OMP variables:") ginkgo_print_module_footer(${detailed_log} "OMP environment variables:") ginkgo_print_env_variable(${detailed_log} "OMP_NUM_THREADS") ginkgo_print_module_footer(${detailed_log} "") diff --git a/reference/CMakeLists.txt b/reference/CMakeLists.txt index 0b5c1aa8ae4..724ee36dbed 100644 --- a/reference/CMakeLists.txt +++ b/reference/CMakeLists.txt @@ -66,7 +66,6 @@ target_link_libraries(ginkgo_reference PUBLIC ginkgo_device) ginkgo_compile_features(ginkgo_reference) ginkgo_default_includes(ginkgo_reference) ginkgo_install_library(ginkgo_reference) -target_compile_options(ginkgo_reference PRIVATE "${GINKGO_COMPILER_FLAGS}") # TODO FIXME: Currently nvhpc 22.7+ optimizations break the reference jacobi's custom # precision implementation (mantissa segmentation) diff --git a/reference/get_info.cmake b/reference/get_info.cmake index 65775a13dc1..f0dd1ccb4a9 100644 --- a/reference/get_info.cmake +++ b/reference/get_info.cmake @@ -1,4 +1,3 @@ -ginkgo_print_module_header(${detailed_log} "Reference") -ginkgo_print_variable(${detailed_log} "GINKGO_BUILD_REFERENCE") -ginkgo_print_variable(${detailed_log} "GINKGO_COMPILER_FLAGS") -ginkgo_print_module_footer(${detailed_log} "") +#ginkgo_print_module_header(${detailed_log} "Reference") +#ginkgo_print_variable(${detailed_log} "GINKGO_BUILD_REFERENCE") +#ginkgo_print_module_footer(${detailed_log} "")