diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 88ba824..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,54 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". -# -*- mode: yaml -*- - -environment: - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 - - matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6target_platformwin-64 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7target_platformwin-64 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -install: - - cmd: set "CI=appveyor" - # If there is a newer build queued for the same PR, cancel this one. - - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda.exe update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Configure the VM. - # Tell conda we want an updated version of conda-forge-ci-setup and conda-build - - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build - - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml -deploy_script: - - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0d80892..8786305 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,30 +10,6 @@ jobs: strategy: maxParallel: 8 matrix: - linux_aarch64_mpimpichpython3.6target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpimpichpython3.6target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_aarch64_mpimpichpython3.7target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpimpichpython3.7target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompipython3.6target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpinompipython3.6target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompipython3.7target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpinompipython3.7target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpipython3.6target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpiopenmpipython3.6target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpipython3.7target_platformlinux-aarch64: - CONFIG: linux_aarch64_mpiopenmpipython3.7target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 linux_mpimpichpython3.6target_platformlinux-64: CONFIG: linux_mpimpichpython3.6target_platformlinux-64 UPLOAD_PACKAGES: True @@ -69,6 +45,7 @@ jobs: - script: | export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME .azure-pipelines/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 796a4d9..a7696b5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -83,6 +83,7 @@ jobs: - script: | source activate base + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f4dc958..7705e70 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -13,11 +13,11 @@ jobs: win_c_compilervs2015cxx_compilervs2015python3.6target_platformwin-64: CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6target_platformwin-64 CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True win_c_compilervs2015cxx_compilervs2015python3.7target_platformwin-64: CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7target_platformwin-64 CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? - script: | @@ -99,6 +99,7 @@ jobs: condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" upload_package .\ .\recipe .ci_support\%CONFIG%.yaml env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.azure-pipelines/run_docker_build.sh b/.azure-pipelines/run_docker_build.sh index f0e77cd..066a857 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.azure-pipelines/run_docker_build.sh @@ -64,6 +64,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e GIT_BRANCH \ + -e UPLOAD_ON_BRANCH \ -e CI \ $DOCKER_IMAGE \ bash \ diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..39d6e83 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,156 @@ +--- +kind: pipeline +name: linux_aarch64_mpimpichpython3.6target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpimpichpython3.6target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_mpimpichpython3.7target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpimpichpython3.7target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_mpinompipython3.6target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpinompipython3.6target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_mpinompipython3.7target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpinompipython3.7target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_mpiopenmpipython3.6target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpiopenmpipython3.6target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_mpiopenmpipython3.7target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_mpiopenmpipython3.7target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.drone/build_steps.sh + - echo "Done building" + diff --git a/.drone/build_steps.sh b/.drone/build_steps.sh new file mode 100755 index 0000000..5756b51 --- /dev/null +++ b/.drone/build_steps.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" + +cat >~/.condarc < - Appveyor + Drone - - windows + + linux diff --git a/recipe/0001-pyd-path-msvc.patch b/recipe/0001-pyd-path-msvc.patch deleted file mode 100644 index f63cf33..0000000 --- a/recipe/0001-pyd-path-msvc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 61c23bfdd6b74ea60ceab6ead1b83108c32b89ab Mon Sep 17 00:00:00 2001 -From: Axel Huebl -Date: Mon, 1 Jul 2019 10:22:32 +0200 -Subject: [PATCH] Python: Fix Windows Build - -Avoid a naming conflict when building the python bindings with NMake -and MSVC of the form -``` -[100%] Linking CXX shared module ..\..\lib\python3.6\site-packages\adios2.cp36-win_amd64.pyd -LINK: command "C:\PROGRA~2\MI0E91~1.0\VC\bin\amd64\link.exe /nologo @CMakeFiles\adios2py.dir\objects1.rsp /out:..\..\lib\python3.6\site-packages\adios2.cp36-win_amd64.pyd /implib:..\..\lib\adios2.lib /pdb:%SRC_DIR%\build\lib\python3.6\site-packages\adios2.pdb /dll /version:0.0 /machine:x64 /INCREMENTAL:NO %PREFIX%\libs\python36.lib -LTCG ..\..\lib\adios2.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:..\..\lib\python3.6\site-packages\adios2.cp36-win_amd64.pyd.manifest" failed (exit code 1149) with the following output: -LINK : fatal error LNK1149: output filename matches input filename '%SRC_DIR%\build\lib\adios2.lib' -NMAKE : fatal error U1077: 'C:\bld\adios2_1561968287896\_build_env\Library\bin\cmake.exe' : return code '0xffffffff' -``` - -Also fix the porper python dir on windows. ---- - bindings/Python/CMakeLists.txt | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/bindings/Python/CMakeLists.txt b/bindings/Python/CMakeLists.txt -index e40988712..a483fca8e 100644 ---- a/bindings/Python/CMakeLists.txt -+++ b/bindings/Python/CMakeLists.txt -@@ -13,16 +13,29 @@ if(ADIOS2_HAVE_MPI) - target_link_libraries(adios2py PRIVATE PythonModule::mpi4py) - endif() - --set(CMAKE_INSTALL_PYTHONDIR -- "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" -+if(WIN32) -+ set(CMAKE_INSTALL_PYTHONDIR_DEFAULT -+ "${CMAKE_INSTALL_LIBDIR}\\site-packages" -+ ) -+else() -+ set(CMAKE_INSTALL_PYTHONDIR_DEFAULT -+ "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" -+ ) -+endif() -+set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR_DEFAULT}" -+ CACHE PATH "Install directory for python modules" - ) --set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}" -- CACHE INTERNAL "" FORCE -+set(CMAKE_PYTHON_OUTPUT_DIRECTORY -+ "${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}" -+ CACHE PATH "Build directory for python modules" - ) - set_target_properties(adios2py PROPERTIES - OUTPUT_NAME adios2 -- LIBRARY_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR} -- RUNTIME_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR} -+ ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY} -+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY} -+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY} -+ PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY} -+ COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY} - ) - install(TARGETS adios2py - DESTINATION ${CMAKE_INSTALL_PYTHONDIR} - diff --git a/recipe/0001-string-compare.patch b/recipe/0001-string-compare.patch new file mode 100644 index 0000000..8983aaa --- /dev/null +++ b/recipe/0001-string-compare.patch @@ -0,0 +1,24 @@ +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/meta.yaml b/recipe/meta.yaml index f8ba2cb..2cb60cb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "adios2" %} -{% set version = "2.4.0" %} -{% set build = 6 %} -{% set sha256 = "50ecea04b1e41c88835b4b3fd4e7bf0a0a2a3129855c9cc4ba6cf6a1575106e2" %} +{% set version = "2.5.0" %} +{% set build = 0 %} +{% set sha256 = "7c8ff3bf5441dd662806df9650c56a669359cb0185ea232ecb3578de7b065329" %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} @@ -19,8 +19,8 @@ source: url: https://github.com/ornladios/ADIOS2/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} patches: - # FIXME: https://github.com/ornladios/ADIOS2/pull/1593 - - 0001-pyd-path-msvc.patch + # FIXME: https://github.com/ornladios/ADIOS2/pull/1805 + - 0001-string-compare.patch build: number: {{ build }}