From ba76f5664deaaeadaf96c64e22193e2a8fa427d3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 29 Jan 2023 23:06:44 +0100 Subject: [PATCH 1/9] [adios2] add port --- ports/adios2/portfile.cmake | 50 +++++++++++++++++++++++++++++++ ports/adios2/vcpkg.json | 59 +++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 ports/adios2/portfile.cmake create mode 100644 ports/adios2/vcpkg.json diff --git a/ports/adios2/portfile.cmake b/ports/adios2/portfile.cmake new file mode 100644 index 00000000000000..50be708b3916b0 --- /dev/null +++ b/ports/adios2/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ornladios/ADIOS2 + REF 473fe8c7d1a13c0746910361aa45ee1b96f57bfb + SHA512 ef8af30419cf57183b52ce9cb29613a381b06e16848a6d22d83c751c43b8485e504be90cead1381adcc92bb8d4912611083cd6d0b73d161b33f779231a041e6c + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + mpi ADIOS2_USE_MPI + cuda ADIOS2_USE_CUDA + python ADIOS2_USE_Python # requires numpy / mpi4py; so not exposed in the manifest yet +) + +set(disabled_options "") +list(APPEND disabled_options ZFP SZ LIBPRESSIO MGARD DAOS DataMan DataSpaces MHS SST BP5 IME Fortran SysVShMem Profiling ) +list(TRANSFORM disabled_options PREPEND "-DADIOS2_USE_") +list(TRANSFORM disabled_options APPEND ":BOOL=OFF") +set(enabled_options "") +list(APPEND enabled_options BZip2 Blosc PNG ZeroMQ HDF5 Endian_Reverse Sodium) +list(TRANSFORM enabled_options PREPEND "-DADIOS2_USE_") +list(TRANSFORM enabled_options APPEND ":BOOL=OFF") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${disabled_options} + ${enabled_options} + -DBUILD_TESTING=OFF + -DADIOS2_BUILD_EXAMPLES=OFF + -DADIOS2_INSTALL_GENERATE_CONFIG=OFF + MAYBE_UNUSED_VARIABLES + ADIOS2_USE_DAOS + ADIOS2_USE_DataMan + ADIOS2_USE_SysVShMem +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +vcpkg_copy_tools(TOOL_NAMES adios2_iotest adios2_reorganize adios2_reorganize_mpi bpls AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/dp" "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/util") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/adios2/vcpkg.json b/ports/adios2/vcpkg.json new file mode 100644 index 00000000000000..47163a1a8c877d --- /dev/null +++ b/ports/adios2/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "adios2", + "version": "2.8.3", + "description": "Next generation of ADIOS developed in the Exascale Computing Program", + "homepage": "https://github.com/ornladios/ADIOS2", + "license": "Apache-2.0", + "dependencies": [ + "blosc", + "bzip2", + { + "name": "hdf5", + "default-features": false + }, + "libffi", + "libpng", + "libsodium", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zeromq" + ], + "features": { + "cuda": { + "description": "Enable CUDA support", + "dependencies": [ + "cuda" + ] + }, + "mpi": { + "description": "Enable MPI support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + "mpi" + ] + }, + "python": { + "description": "Enable Python bindings", + "dependencies": [ + "python3", + { + "name": "python3", + "host": true + } + ] + } + } +} From 03bbedb50a1c6fe7df313ea5fa3ffaae134e493e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 29 Jan 2023 23:06:56 +0100 Subject: [PATCH 2/9] v db --- versions/a-/adios2.json | 9 +++++++++ versions/baseline.json | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 versions/a-/adios2.json diff --git a/versions/a-/adios2.json b/versions/a-/adios2.json new file mode 100644 index 00000000000000..2cccc49e52915b --- /dev/null +++ b/versions/a-/adios2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c9640fe3792418ef650a030c5f729b5fed1cc17", + "version": "2.8.3", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1bda4f83223174..4fa48dfd82679e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -36,6 +36,10 @@ "baseline": "0.1.1f", "port-version": 2 }, + "adios2": { + "baseline": "2.8.3", + "port-version": 0 + }, "advobfuscator": { "baseline": "2020-06-26", "port-version": 0 From 19004628c0958c65447798cd2435456d23ebfea7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 29 Jan 2023 23:20:27 +0100 Subject: [PATCH 3/9] remove one of the executable --- ports/adios2/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/adios2/portfile.cmake b/ports/adios2/portfile.cmake index 50be708b3916b0..10e991df407a2b 100644 --- a/ports/adios2/portfile.cmake +++ b/ports/adios2/portfile.cmake @@ -41,7 +41,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_copy_tools(TOOL_NAMES adios2_iotest adios2_reorganize adios2_reorganize_mpi bpls AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES adios2_reorganize adios2_reorganize_mpi bpls AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 5fc82baa5ad3f17a9fd2f1527cdb6a468e1557f9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 31 Jan 2023 18:37:11 +0100 Subject: [PATCH 4/9] add usage fix tools. --- ports/adios2/portfile.cmake | 7 ++++++- ports/adios2/usage | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ports/adios2/usage diff --git a/ports/adios2/portfile.cmake b/ports/adios2/portfile.cmake index 10e991df407a2b..10980fecd5ce5e 100644 --- a/ports/adios2/portfile.cmake +++ b/ports/adios2/portfile.cmake @@ -41,7 +41,12 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_copy_tools(TOOL_NAMES adios2_reorganize adios2_reorganize_mpi bpls AUTO_CLEAN) +set(tools "adios2_reorganize" "bpls") +if(ADIOS2_USE_MPI) + list(APPEND tools "adios2_reorganize_mpi" "adios2_iotest") +endif() + +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/adios2/usage b/ports/adios2/usage new file mode 100644 index 00000000000000..eb6142ab3bc5b6 --- /dev/null +++ b/ports/adios2/usage @@ -0,0 +1,4 @@ +The package adios2 provides CMake targets: + + find_package(adios2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE adios2::adios2) From 5de49c81ecb36a94e18904ffb23cdb19c83112b1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 31 Jan 2023 18:37:36 +0100 Subject: [PATCH 5/9] v db --- versions/a-/adios2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/adios2.json b/versions/a-/adios2.json index 2cccc49e52915b..658436c280e5a4 100644 --- a/versions/a-/adios2.json +++ b/versions/a-/adios2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c9640fe3792418ef650a030c5f729b5fed1cc17", + "git-tree": "e5ca139a43651e7c9835fccac97ab059fddeff4a", "version": "2.8.3", "port-version": 0 } From 52576e81fad5043f2f16c924217b286985f5d65e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 31 Jan 2023 21:25:55 +0100 Subject: [PATCH 6/9] fix static builds --- ports/adios2/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/adios2/portfile.cmake b/ports/adios2/portfile.cmake index 10980fecd5ce5e..d20cdba78d1810 100644 --- a/ports/adios2/portfile.cmake +++ b/ports/adios2/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_cmake_configure( MAYBE_UNUSED_VARIABLES ADIOS2_USE_DAOS ADIOS2_USE_DataMan + ADIOS2_USE_DataSpaces ADIOS2_USE_SysVShMem ) @@ -47,9 +48,15 @@ if(ADIOS2_USE_MPI) endif() vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/adios2_deactivate_bp" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/adios2_deactivate_bp") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/dp" "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/util") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file From de36e1451d2a3225d3e07cf2accb526ad5dd11ac Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 31 Jan 2023 21:26:13 +0100 Subject: [PATCH 7/9] v db --- versions/a-/adios2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/adios2.json b/versions/a-/adios2.json index 658436c280e5a4..b14656ccf43224 100644 --- a/versions/a-/adios2.json +++ b/versions/a-/adios2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e5ca139a43651e7c9835fccac97ab059fddeff4a", + "git-tree": "e5459ab8020f7f22143ee5158aa294b4a1ef8ea8", "version": "2.8.3", "port-version": 0 } From 02a0d4f60a8400d8b652fde52e6ca98e2f5b4d7b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:14:38 +0100 Subject: [PATCH 8/9] cr comments --- ports/adios2/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/adios2/portfile.cmake b/ports/adios2/portfile.cmake index d20cdba78d1810..71f6fe14433899 100644 --- a/ports/adios2/portfile.cmake +++ b/ports/adios2/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) set(disabled_options "") -list(APPEND disabled_options ZFP SZ LIBPRESSIO MGARD DAOS DataMan DataSpaces MHS SST BP5 IME Fortran SysVShMem Profiling ) +list(APPEND disabled_options ZFP SZ LIBPRESSIO MGARD DAOS DataMan DataSpaces MHS SST BP5 IME Fortran SysVShMem Profiling) list(TRANSFORM disabled_options PREPEND "-DADIOS2_USE_") list(TRANSFORM disabled_options APPEND ":BOOL=OFF") set(enabled_options "") @@ -58,5 +58,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/dp" "${CURRENT_PACKAGES_DIR}/include/adios2/toolkit/sst/util") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") From ebfd7a2b634fc9eb274d8e8c9a2909dfb6544953 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:14:58 +0100 Subject: [PATCH 9/9] v db --- versions/a-/adios2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/adios2.json b/versions/a-/adios2.json index b14656ccf43224..524dc34b08b126 100644 --- a/versions/a-/adios2.json +++ b/versions/a-/adios2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e5459ab8020f7f22143ee5158aa294b4a1ef8ea8", + "git-tree": "1a832feea61b7166bf688a246cda2f7c038aeeac", "version": "2.8.3", "port-version": 0 }