From 14afa2e4658a1fa42750a650681dc6b39cee4b21 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 12 Jan 2021 19:01:15 +0000 Subject: [PATCH 1/3] updated v2.7.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92442ad..eb31e99 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "adios2" %} -{% set version = "2.6.0" %} -{% set build = 7 %} -{% set sha256 = "45b41889065f8b840725928db092848b8a8b8d1bfae1b92e72f8868d1c76216c" %} +{% set version = "2.7.0" %} +{% set build = 0 %} +{% set sha256 = "4b5df1a1f92d7ff380416dec7511cfcfe3dc44da27e486ed63c3e6cffb173924" %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} From dcffdbce6bf8576713acc5a2259cfeb016f73c33 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 13 Jan 2021 15:04:07 -0800 Subject: [PATCH 2/3] Patch: bp2h5 symlink on Windows Apply patch to fix broken Windows build with 2.7.0 --- recipe/0001-string-compare.patch | 24 ------------- recipe/0001-win-bp2h5-symlink.patch | 53 +++++++++++++++++++++++++++++ recipe/meta.yaml | 3 ++ 3 files changed, 56 insertions(+), 24 deletions(-) delete mode 100644 recipe/0001-string-compare.patch create mode 100644 recipe/0001-win-bp2h5-symlink.patch diff --git a/recipe/0001-string-compare.patch b/recipe/0001-string-compare.patch deleted file mode 100644 index 8983aaa..0000000 --- a/recipe/0001-string-compare.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 013d1a62e6f007dad78dc9c5985ea15241a7eec1 Mon Sep 17 00:00:00 2001 -From: Axel Huebl -Date: Thu, 3 Oct 2019 15:50:45 -0700 -Subject: [PATCH] OSX: Fix JSON Compile Issue - -Cast to `std::string` to avoid ambiguity in `std::string::compare`. ---- - source/adios2/toolkit/query/JsonWorker.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/adios2/toolkit/query/JsonWorker.cpp b/source/adios2/toolkit/query/JsonWorker.cpp -index 6af485879..d2657382a 100644 ---- a/source/adios2/toolkit/query/JsonWorker.cpp -+++ b/source/adios2/toolkit/query/JsonWorker.cpp -@@ -124,7 +124,7 @@ void JsonWorker::ParseJson() - } - - auto ioO = jsonObj.find("io"); -- auto ioName = (*ioO)["name"]; -+ std::string const ioName = (*ioO)["name"]; - if (m_SourceReader->m_IO.m_Name.compare(ioName) != 0) - throw std::ios_base::failure("invalid query io. Expecting io name = " + - m_SourceReader->m_IO.m_Name); - diff --git a/recipe/0001-win-bp2h5-symlink.patch b/recipe/0001-win-bp2h5-symlink.patch new file mode 100644 index 0000000..126d526 --- /dev/null +++ b/recipe/0001-win-bp2h5-symlink.patch @@ -0,0 +1,53 @@ +From 91c4e603d5270a02a2ed468869e0bb7c8ff4d9dd Mon Sep 17 00:00:00 2001 +From: Chuck Atkins +Date: Tue, 12 Jan 2021 16:36:51 -0500 +Subject: [PATCH] bp2h5: Use copy instead of symlinks because of windows + +--- + source/utils/CMakeLists.txt | 7 ++----- + source/utils/adios_reorganize/bp2h5 | 1 - + source/utils/adios_reorganize/bp2h5_mpi | 1 - + 3 files changed, 2 insertions(+), 7 deletions(-) + delete mode 120000 source/utils/adios_reorganize/bp2h5 + delete mode 120000 source/utils/adios_reorganize/bp2h5_mpi + +diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt +index eeefbcfe1..b8acbf7f5 100644 +--- a/source/utils/CMakeLists.txt ++++ b/source/utils/CMakeLists.txt +@@ -84,17 +84,14 @@ configure_file( + ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper + @ONLY + ) ++ + if(ADIOS2_HAVE_HDF5) + install(PROGRAMS ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper +- RENAME adios2_reorganize_wrapper${ADIOS2_EXECUTABLE_SUFFIX} +- DESTINATION ${CMAKE_INSTALL_BINDIR} +- ) +- install(PROGRAMS adios_reorganize/bp2h5 + RENAME bp2h5${ADIOS2_EXECUTABLE_SUFFIX} + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + if(ADIOS2_HAVE_MPI) +- install(PROGRAMS adios_reorganize/bp2h5_mpi ++ install(PROGRAMS ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper + RENAME bp2h5_mpi${ADIOS2_EXECUTABLE_SUFFIX} + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +diff --git a/source/utils/adios_reorganize/bp2h5 b/source/utils/adios_reorganize/bp2h5 +deleted file mode 120000 +index 0ad254a02..000000000 +--- a/source/utils/adios_reorganize/bp2h5 ++++ /dev/null +@@ -1 +0,0 @@ +-adios2_reorganize_wrapper +\ No newline at end of file +diff --git a/source/utils/adios_reorganize/bp2h5_mpi b/source/utils/adios_reorganize/bp2h5_mpi +deleted file mode 120000 +index 0ad254a02..000000000 +--- a/source/utils/adios_reorganize/bp2h5_mpi ++++ /dev/null +@@ -1 +0,0 @@ +-adios2_reorganize_wrapper +\ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eb31e99..e96fc3e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,9 @@ package: source: url: https://github.com/ornladios/ADIOS2/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + # https://github.com/ornladios/ADIOS2/pull/2583 + - 0001-win-bp2h5-symlink.patch build: number: {{ build }} From 7c6ab7489b23c36909e7b2815e38b3e4bc96d55a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 13 Jan 2021 16:52:46 -0800 Subject: [PATCH 3/3] Don't touch symlink files (macOS hickup) --- recipe/0001-win-bp2h5-symlink.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/recipe/0001-win-bp2h5-symlink.patch b/recipe/0001-win-bp2h5-symlink.patch index 126d526..cff24c2 100644 --- a/recipe/0001-win-bp2h5-symlink.patch +++ b/recipe/0001-win-bp2h5-symlink.patch @@ -35,19 +35,3 @@ index eeefbcfe1..b8acbf7f5 100644 RENAME bp2h5_mpi${ADIOS2_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_INSTALL_BINDIR} ) -diff --git a/source/utils/adios_reorganize/bp2h5 b/source/utils/adios_reorganize/bp2h5 -deleted file mode 120000 -index 0ad254a02..000000000 ---- a/source/utils/adios_reorganize/bp2h5 -+++ /dev/null -@@ -1 +0,0 @@ --adios2_reorganize_wrapper -\ No newline at end of file -diff --git a/source/utils/adios_reorganize/bp2h5_mpi b/source/utils/adios_reorganize/bp2h5_mpi -deleted file mode 120000 -index 0ad254a02..000000000 ---- a/source/utils/adios_reorganize/bp2h5_mpi -+++ /dev/null -@@ -1 +0,0 @@ --adios2_reorganize_wrapper -\ No newline at end of file