Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adios2 v2.7.0 #24

Merged
merged 3 commits into from
Jan 14, 2021
Merged

adios2 v2.7.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14afa2e
updated v2.7.0
regro-cf-autotick-bot Jan 12, 2021
dcffdbc
Patch: bp2h5 symlink on Windows
ax3l Jan 13, 2021
7c6ab74
Don't touch symlink files (macOS hickup)
ax3l Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions recipe/0001-string-compare.patch
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions recipe/0001-win-bp2h5-symlink.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 91c4e603d5270a02a2ed468869e0bb7c8ff4d9dd Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
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}
)
9 changes: 6 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' %}
Expand All @@ -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 }}
Expand Down