From f903df40a2df1c545f55f352837a104927657e03 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Mon, 24 Jun 2024 13:14:05 +0200 Subject: [PATCH 1/5] WIP: Build "workflow-dev" packages for python 3.10 --- .github/workflows/build-test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 0b730fb..44166f3 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -10,7 +10,7 @@ jobs: if: github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags') uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 with: - python3-minor-versions: '["8","11"]' + python3-minor-versions: '["10","11"]' manylinux-platforms: '["_2_28-x64","2014-x64"]' test-notebooks: true secrets: From 22264836b3bbdca53492582e6f1d154737e0ec55 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Thu, 20 Jun 2024 20:29:59 +0200 Subject: [PATCH 2/5] WIP: Update elastix version to 2024-07-08, inc. removal of OpenMP code Including: - pull request https://github.com/SuperElastix/elastix/pull/1188 commit https://github.com/SuperElastix/elastix/commit/e49c47fbb8bca796288796f85020c02ffe85b5d7 STYLE: Remove unused ELASTIX_USE_OPENMP option and OpenMP compiler flags - pull request https://github.com/SuperElastix/elastix/pull/1155 commit https://github.com/SuperElastix/elastix/commit/8111c672508d89995550e63ba54ab871e324105b ENH: Add support ComputeZYX parameter to EulerStackTransform (for 3D) And many more commits (400+ commits ahead of https://github.com/thewtex/elastix/tree/ITKElastix-2023-01-01-022aa6cd) --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4232978..7ec6ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,11 +64,9 @@ if(WASI OR EMSCRIPTEN) option(ELASTIX_NO_INSTALL_EXECUTABLES "Do not install executables" ON) endif() -# set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") -set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") -# Upstream + wasm patches -# Branch: ITKElastix-2023-01-01-022aa6cd -set(elastix_GIT_TAG "022aa6cdaaa5621f3d6b2f245c388a9669cc7ef9") +set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") +# Commit 2024-07-08: "STYLE: Remove unused ELASTIX_USE_OPENMP option and OpenMP compiler flags" +set(elastix_GIT_TAG "e49c47fbb8bca796288796f85020c02ffe85b5d7") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 36c422606c5f867e416b0af58cfb479d89db6a8b Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 9 Jul 2024 10:59:07 +0200 Subject: [PATCH 3/5] PERF: Remove OpenMP specific CMake code - Following pull request https://github.com/SuperElastix/elastix/pull/1188 "Remove OpenMP based code, ELASTIX_USE_OPENMP option and OpenMP compiler flags" --- CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ec6ecd..ccba41c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,11 +27,6 @@ if(NOT DEFINED USE_KNNGraphAlphaMutualInformationMetric) set(USE_KNNGraphAlphaMutualInformationMetric OFF CACHE BOOL "Use KNN metric. Requires ANN library.") endif() -if(CMAKE_COMPILER_IS_GNUCXX AND - ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_EQUAL "4.8") OR - ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER "4.8" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "5.0") ) - set(ELASTIX_USE_OPENMP OFF CACHE BOOL "Use OpenMP in elastix") -endif() if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-aggressive-loop-optimizations") endif() @@ -60,7 +55,6 @@ if(SKBUILD) endif() if(WASI OR EMSCRIPTEN) - option(ELASTIX_USE_OPENMP "OpenMP not supported on WASI or Emscripten" OFF) option(ELASTIX_NO_INSTALL_EXECUTABLES "Do not install executables" ON) endif() @@ -88,17 +82,6 @@ find_package(Elastix REQUIRED) include_directories( ${ELASTIX_INCLUDE_DIRS} ) link_directories( ${ELASTIX_LIBRARY_DIRS} ) #include(${ELASTIX_USE_FILE}) -if(ELASTIX_USE_OPENMP) - find_package(OpenMP QUIET) - if(OPENMP_FOUND) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${OpenMP_STATIC_LINKER_FLAGS}") - add_definitions(-DELASTIX_USE_OPENMP) - endif() -endif() if(ELASTIX_USE_OPENCL) add_definitions(-DELASTIX_USE_OPENCL) endif() From e9bc8dba3d75bcba7b525b7f71559bba7bed3e49 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Thu, 11 Jul 2024 15:38:29 +0200 Subject: [PATCH 4/5] WIP: Update elastix version to 5.2.0, 2024-07-18 - Update to release https://github.com/SuperElastix/elastix/releases/tag/5.2.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccba41c..196314a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,8 @@ if(WASI OR EMSCRIPTEN) endif() set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") -# Commit 2024-07-08: "STYLE: Remove unused ELASTIX_USE_OPENMP option and OpenMP compiler flags" -set(elastix_GIT_TAG "e49c47fbb8bca796288796f85020c02ffe85b5d7") +# Released on 2024-07-18: +set(elastix_GIT_TAG "5.2.0") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 4e3d6599f3ccedba4281d1898b119bc4db7d079b Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Mon, 22 Jul 2024 16:17:06 +0200 Subject: [PATCH 5/5] WIP: Experimental elx branch "Print number of threads in thread pool" --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 196314a..dfd9d00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,8 @@ if(WASI OR EMSCRIPTEN) endif() set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") -# Released on 2024-07-18: -set(elastix_GIT_TAG "5.2.0") +# Branch https://github.com/SuperElastix/elastix/tree/PrintNumberOfThreads (2024-07-22): +set(elastix_GIT_TAG "07cafb796423823f6426d7166ff3c78daedd1e73") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY}