Skip to content

Commit

Permalink
Merge pull request #188 from akrherz/gh182_revert_s3
Browse files Browse the repository at this point in the history 
Revert S3 Support
  • Loading branch information
@kmuehlbauer
kmuehlbauer authored Aug 30, 2023
2 parents 844c628 + 69e4731 commit 2dc6848
Show file tree
Hide file tree
Showing 19 changed files with 5 additions and 38 deletions.
2 changes: 0 additions & 2 deletions .ci_support/linux_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_aarch64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_aarch64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_aarch64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
aws_sdk_cpp:
- 1.10.57
bzip2:
- '1'
c_compiler:
Expand Down
4 changes: 2 additions & 2 deletions recipe/bld.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ cmake -LAH -G "NMake Makefiles" ^
-DENABLE_BYTERANGE=ON ^
-DENABLE_NCZARR=on ^
-DENABLE_NCZARR_ZIP=on ^
-DENABLE_NCZARR_S3=on ^
-DENABLE_NCZARR_S3=off ^
-DENABLE_NCZARR_S3_TESTS=off ^
-DENABLE_S3_SDK=on ^
-DENABLE_S3_SDK=off ^
-DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^
-DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^
-DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^
Expand Down
4 changes: 2 additions & 2 deletions recipe/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ cmake ${CMAKE_ARGS} \
-DENABLE_BYTERANGE=ON \
-DENABLE_NCZARR=on \
-DENABLE_NCZARR_ZIP=on \
-DENABLE_NCZARR_S3=on \
-DENABLE_NCZARR_S3=off \
-DENABLE_NCZARR_S3_TESTS=off \
-DENABLE_S3_SDK=on \
-DENABLE_S3_SDK=off \
${PARALLEL} \
${SRC_DIR}
make install -j${CPU_COUNT} ${VERBOSE_CM}
Expand Down
3 changes: 1 addition & 2 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "4.9.2" %}
{% set build = 10 %}
{% set build = 11 %}

# recipe-lint fails if mpi is undefined
{% set mpi = mpi or 'nompi' %}
Expand Down Expand Up @@ -84,7 +84,6 @@ requirements:
- openssl # [unix]
- zlib
- zstd
- aws-sdk-cpp

test:
commands:
Expand Down

0 comments on commit 2dc6848

Please sign in to comment.