From 758ee3acdd840ea333a9b1fe50d3dd02ddf5017a Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 18 Jan 2022 10:10:20 +1000 Subject: [PATCH 01/17] Try win build --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc8ca04..298a021 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,8 +12,7 @@ source: - fix_build.patch build: - number: 0 - skip: true # [win] + number: 1 run_exports: - {{ pin_subpackage('colmap', max_pin='x.x') }} @@ -50,7 +49,8 @@ requirements: - xorg-libsm # [unix] - libglu # [linux] # deps - - boost-cpp + - boost-cpp # [not win] + - boost-cpp 1.76 # [win] - suitesparse - eigen - freeimage From 7ea2cb446fe3ddfdc32e2e17557a3faeae08e879 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 00:20:05 +0000 Subject: [PATCH 02/17] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.1, and conda-forge-pinning 2022.01.17.22.01.08 --- .azure-pipelines/azure-pipelines-linux.yml | 7 +- .azure-pipelines/azure-pipelines-osx.yml | 5 + .azure-pipelines/azure-pipelines-win.yml | 110 +++++++++++++++++++++ .ci_support/linux_64_.yaml | 6 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/win_64_.yaml | 41 ++++++++ .gitattributes | 1 + .scripts/build_steps.sh | 12 ++- .scripts/run_docker_build.sh | 7 +- .scripts/run_osx_build.sh | 14 +-- README.md | 10 +- azure-pipelines.yml | 1 + build-locally.py | 5 + 13 files changed, 202 insertions(+), 19 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f04e699..974e878 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: @@ -32,6 +32,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/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 0c89240..d7c37d2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,11 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..e8029d9 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,110 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2019 + strategy: + matrix: + win_64_: + CONFIG: win_64_ + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional + installOptions: "-c conda-forge" + updateConda: true + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + + # Special cased version setting some more things! + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe (vs2008) + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + call activate base + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + condition: not(contains(variables['CONFIG'], 'vs2008')) + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 8801735..354396c 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,7 +7,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 flann: - 1.9.1 gflags: @@ -54,5 +54,3 @@ vlfeat: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a2fbb87..bd7db7c 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml new file mode 100644 index 0000000..da57742 --- /dev/null +++ b/.ci_support/win_64_.yaml @@ -0,0 +1,41 @@ +boost_cpp: +- 1.74.0 +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +flann: +- 1.9.1 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.5' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + flann: + max_pin: x.x.x + glew: + max_pin: x.x + qt: + max_pin: x.x + sqlite: + max_pin: x + vlfeat: + max_pin: x.x.x +qt: +- '5.12' +sqlite: +- '3' +suitesparse: +- '5' +target_platform: +- win-64 +vlfeat: +- 0.9.20 diff --git a/.gitattributes b/.gitattributes index 9060b27..ce52713 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a0686..ff01283 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,9 +27,10 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge + +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -38,6 +41,7 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + ( endgroup "Configuring conda" ) 2> /dev/null if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then @@ -51,7 +55,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null @@ -62,7 +66,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1..0c6515f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 96d0278..d10e0c2 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,21 +11,21 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa @@ -53,7 +55,7 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" @@ -62,7 +64,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/README.md b/README.md index 184af61..29accdf 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,13 @@ Current build status variant + + win_64 + + + variant + + @@ -81,7 +88,8 @@ conda search colmap --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 00eeb34..8b74348 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -21,6 +22,10 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) + if "OSX_SDK_DIR" not in os.environ: + os.environ["OSX_SDK_DIR"] = os.path.join( + os.path.dirname(__file__), "SDKs" + ) def run_docker_build(ns): From 0a8a9774fd2c8a14fbc53b9dc5b607d5afbdff85 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 18 Jan 2022 10:53:46 +1000 Subject: [PATCH 03/17] Update meta.yaml --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 298a021..6c652a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,8 +49,7 @@ requirements: - xorg-libsm # [unix] - libglu # [linux] # deps - - boost-cpp # [not win] - - boost-cpp 1.76 # [win] + - boost-cpp - suitesparse - eigen - freeimage From ade24316dfa33e39d6cfbeb98b2098775962574d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 18 Jan 2022 10:54:28 +1000 Subject: [PATCH 04/17] Create conda_build_config.yaml --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..0fd6144 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +boost-cpp: # [win] + - 1.76 # [win] From 4b72ed4a5f059b890f3608509303f3edb196dd1c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 21 Jul 2022 09:49:41 +1000 Subject: [PATCH 05/17] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 0fd6144..205954a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,2 @@ -boost-cpp: # [win] - - 1.76 # [win] +# boost-cpp: # [win] +# - 1.76 # [win] From c7daf8ad2ebf444f66ea5093a9035197f8af3bc9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 23:51:33 +0000 Subject: [PATCH 06/17] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and conda-forge-pinning 2022.07.20.21.54.10 --- .azure-pipelines/azure-pipelines-win.yml | 70 +++++++----------------- .ci_support/win_64_.yaml | 10 ++-- .scripts/build_steps.sh | 1 - README.md | 4 +- build-locally.py | 4 -- 5 files changed, 27 insertions(+), 62 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e8029d9..8a0bcae 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,46 +16,27 @@ jobs: CONDA_BLD_PATH: D:\\bld\\ steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath - - Get-ChildItem -Path $batchDir + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - Get-ChildItem -Path ($batchDir + '\..') + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 displayName: Set PYTHONUNBUFFERED @@ -72,25 +53,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - script: | call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index da57742..72e2383 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -15,7 +15,7 @@ gflags: glew: - '2.1' glog: -- '0.5' +- '0.6' pin_run_as_build: boost-cpp: max_pin: x.x.x @@ -23,14 +23,12 @@ pin_run_as_build: max_pin: x.x.x glew: max_pin: x.x - qt: - max_pin: x.x sqlite: max_pin: x vlfeat: max_pin: x.x.x -qt: -- '5.12' +qt_main: +- '5.15' sqlite: - '3' suitesparse: @@ -38,4 +36,4 @@ suitesparse: target_platform: - win-64 vlfeat: -- 0.9.20 +- 0.9.21 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 82f8028..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -50,7 +50,6 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != l fi - ( endgroup "Configuring conda" ) 2> /dev/null if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then diff --git a/README.md b/README.md index cd43d96..a8f5b00 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ Current build status win_64 - - variant + + variant diff --git a/build-locally.py b/build-locally.py index 997c218..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): From e220cb48a65c0732e2360e739ac04b21b7f462c3 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 07:42:22 +1000 Subject: [PATCH 07/17] Update fix_build.patch --- recipe/fix_build.patch | 150 ----------------------------------------- 1 file changed, 150 deletions(-) diff --git a/recipe/fix_build.patch b/recipe/fix_build.patch index 1cac40d..5a4b4cd 100644 --- a/recipe/fix_build.patch +++ b/recipe/fix_build.patch @@ -13,156 +13,6 @@ index 7886d36..3f57631 ################################################################################ # Options -@@ -107,6 +107,11 @@ find_package(OpenGL REQUIRED) - find_package(Glew REQUIRED) - find_package(Git) - -+find_package(SQLite3 REQUIRED) -+find_package(VLFEAT REQUIRED) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules (FLANN flann) -+ - if(CGAL_ENABLED) - set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE TRUE) - find_package(CGAL QUIET) -@@ -311,6 +316,9 @@ set(COLMAP_INCLUDE_DIRS - ${FREEIMAGE_INCLUDE_DIRS} - ${CERES_INCLUDE_DIRS} - ${GLEW_INCLUDE_DIRS} -+ ${FLANN_INCLUDE_DIRS} -+ ${SQLite3_INCLUDE_DIRS} -+ ${VLFEAT_INCLUDE_DIRS} - ) - - set(COLMAP_LINK_DIRS -@@ -326,6 +334,9 @@ set(COLMAP_EXTERNAL_LIBRARIES - ${FREEIMAGE_LIBRARIES} - ${CERES_LIBRARIES} - ${OPENGL_LIBRARIES} -+ ${FLANN_LIBRARIES} -+ ${SQLite3_LIBRARIES} -+ ${VLFEAT_LIBRARIES} - ) - - if(OPENMP_FOUND) -@@ -348,14 +359,14 @@ if(UNIX) - endif() - - set(COLMAP_INTERNAL_LIBRARIES -- flann -+ # flann - graclus - lsd - pba - poisson_recon -- sqlite3 -+ # sqlite3 - sift_gpu -- vlfeat -+ # vlfeat - ) - - include_directories( -@@ -374,14 +385,14 @@ add_subdirectory(src) - # Generate source groups for Visual Studio, XCode, etc. - ################################################################################ - --COLMAP_ADD_SOURCE_DIR(lib/FLANN LIB_FLANN_SRCS *.h *.cpp *.hpp *.cu) -+# COLMAP_ADD_SOURCE_DIR(lib/FLANN LIB_FLANN_SRCS *.h *.cpp *.hpp *.cu) - COLMAP_ADD_SOURCE_DIR(lib/Graclus LIB_GRACLUS_SRCS *.h *.c) - COLMAP_ADD_SOURCE_DIR(lib/LSD LIB_LSD_SRCS *.h *.c) - COLMAP_ADD_SOURCE_DIR(lib/PBA LIB_PBA_SRCS *.h *.cpp *.cu) - COLMAP_ADD_SOURCE_DIR(lib/PoissonRecon LIB_POISSON_RECON_SRCS *.h *.cpp *.inl) - COLMAP_ADD_SOURCE_DIR(lib/SiftGPU LIB_SIFT_GPU_SRCS *.h *.cpp *.cu) --COLMAP_ADD_SOURCE_DIR(lib/SQLite LIB_SQLITE_SRCS *.h *.c) --COLMAP_ADD_SOURCE_DIR(lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc) -+# COLMAP_ADD_SOURCE_DIR(lib/SQLite LIB_SQLITE_SRCS *.h *.c) -+# COLMAP_ADD_SOURCE_DIR(lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc) - - COLMAP_ADD_SOURCE_DIR(src/base BASE_SRCS *.h *.cc) - COLMAP_ADD_SOURCE_DIR(src/controllers CONTROLLERS_SRCS *.h *.cc) -@@ -401,14 +412,14 @@ COLMAP_ADD_SOURCE_DIR(src/util UTIL_SRCS *.h *.cc) - # intellisense can't find any of the included files). - add_library( - ${COLMAP_SRC_ROOT_FOLDER} -- ${LIB_FLANN_SRCS} -+ # ${LIB_FLANN_SRCS} - ${LIB_GRACLUS_SRCS} - ${LIB_LSD_SRCS} - ${LIB_PBA_SRCS} - ${LIB_POISSON_RECON_SRCS} - ${LIB_SIFT_GPU_SRCS} -- ${LIB_SQLITE_SRCS} -- ${LIB_VLFEAT_SRCS} -+ # ${LIB_SQLITE_SRCS} -+ # ${LIB_VLFEAT_SRCS} - ${BASE_SRCS} - ${CONTROLLERS_SRCS} - ${ESTIMATORS_SRCS} -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 54aab8db7..ea9d0e4c7 100755 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -35,11 +35,11 @@ elseif(IS_GNU OR IS_CLANG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - endif() - --add_subdirectory(FLANN) -+# add_subdirectory(FLANN) - add_subdirectory(Graclus) - add_subdirectory(LSD) - add_subdirectory(PBA) - add_subdirectory(PoissonRecon) - add_subdirectory(SiftGPU) --add_subdirectory(SQLite) --add_subdirectory(VLFeat) -+# add_subdirectory(SQLite) -+# add_subdirectory(VLFeat) ---- /dev/null 2021-07-26 16:13:59.421873396 +1000 -+++ b/cmake/FindVLFEAT.cmake 2021-07-27 08:37:45.530591354 +1000 -@@ -0,0 +1,42 @@ -+# - Find the VLFEAT library (http://www.vlfeat.org/) -+# If VLFEAT is installed in an unusual location, define VLFEAT_ROOT. -+# This module defines the following variables: -+# VLFEAT_INCLUDE_DIR, where to find the VLFEAT include files -+# VLFEAT_LIBRARIES, the libraries needed to use VLFEAT. -+# VLFEAT_FOUND, If false, do not try to use VLFEAT. -+ -+#============================================================================= -+# Copyright 2014 Roman Hiestand -+# -+# Distributed under the MIT License. -+# -+# This software is distributed WITHOUT ANY WARRANTY; without even the -+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+# See the License for more information. -+#============================================================================= -+ -+FIND_PATH(VLFEAT_INCLUDE_DIR vl/generic.h -+ PATHS -+ /usr/local/include -+ /usr/include -+ ${VLFEAT_ROOT}/include -+ DOC "Location of VLFEAT Headers" -+) -+ -+FIND_LIBRARY(VLFEAT_LIBRARY -+ NAMES vl libvl -+ PATHS /usr/lib /usr/local/lib ${VLFEAT_ROOT}/lib -+) -+ -+# Handle the QUIETLY and REQUIRED arguments and set VLFEAT_FOUND to TRUE -+INCLUDE(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(VLFEAT DEFAULT_MSG -+ VLFEAT_LIBRARY VLFEAT_INCLUDE_DIR) -+ -+IF(VLFEAT_FOUND) -+ SET(VLFEAT_LIBRARIES ${VLFEAT_LIBRARY}) -+ SET(VLFEAT_INCLUDE_DIRS ${VLFEAT_INCLUDE_DIR}) -+ENDIF(VLFEAT_FOUND) -+ -+MARK_AS_ADVANCED(VLFEAT_INCLUDE_DIR VLFEAT_LIBRARY VLFEAT_LIBRARIES) -+ diff --git a/lib/PoissonRecon/CMakeLists.txt b/lib/PoissonRecon/CMakeLists.txt index 7841eb6..9f27293 100644 --- a/lib/PoissonRecon/CMakeLists.txt From d1f9ebc031190709366ee81b15f8cbc8acb6c849 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 07:42:27 +1000 Subject: [PATCH 08/17] Create unvendor_libs.patch --- recipe/unvendor_libs.patch | 156 +++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 recipe/unvendor_libs.patch diff --git a/recipe/unvendor_libs.patch b/recipe/unvendor_libs.patch new file mode 100644 index 0000000..8592eb5 --- /dev/null +++ b/recipe/unvendor_libs.patch @@ -0,0 +1,156 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +old mode 100755 +new mode 100644 +index 7886d36..3f57631 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -107,6 +107,11 @@ find_package(OpenGL REQUIRED) + find_package(Glew REQUIRED) + find_package(Git) + ++find_package(SQLite3 REQUIRED) ++find_package(VLFEAT REQUIRED) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules (FLANN flann) ++ + if(CGAL_ENABLED) + set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE TRUE) + find_package(CGAL QUIET) +@@ -311,6 +316,9 @@ set(COLMAP_INCLUDE_DIRS + ${FREEIMAGE_INCLUDE_DIRS} + ${CERES_INCLUDE_DIRS} + ${GLEW_INCLUDE_DIRS} ++ ${FLANN_INCLUDE_DIRS} ++ ${SQLite3_INCLUDE_DIRS} ++ ${VLFEAT_INCLUDE_DIRS} + ) + + set(COLMAP_LINK_DIRS +@@ -326,6 +334,9 @@ set(COLMAP_EXTERNAL_LIBRARIES + ${FREEIMAGE_LIBRARIES} + ${CERES_LIBRARIES} + ${OPENGL_LIBRARIES} ++ ${FLANN_LIBRARIES} ++ ${SQLite3_LIBRARIES} ++ ${VLFEAT_LIBRARIES} + ) + + if(OPENMP_FOUND) +@@ -348,14 +359,14 @@ if(UNIX) + endif() + + set(COLMAP_INTERNAL_LIBRARIES +- flann ++ # flann + graclus + lsd + pba + poisson_recon +- sqlite3 ++ # sqlite3 + sift_gpu +- vlfeat ++ # vlfeat + ) + + include_directories( +@@ -374,14 +385,14 @@ add_subdirectory(src) + # Generate source groups for Visual Studio, XCode, etc. + ################################################################################ + +-COLMAP_ADD_SOURCE_DIR(lib/FLANN LIB_FLANN_SRCS *.h *.cpp *.hpp *.cu) ++# COLMAP_ADD_SOURCE_DIR(lib/FLANN LIB_FLANN_SRCS *.h *.cpp *.hpp *.cu) + COLMAP_ADD_SOURCE_DIR(lib/Graclus LIB_GRACLUS_SRCS *.h *.c) + COLMAP_ADD_SOURCE_DIR(lib/LSD LIB_LSD_SRCS *.h *.c) + COLMAP_ADD_SOURCE_DIR(lib/PBA LIB_PBA_SRCS *.h *.cpp *.cu) + COLMAP_ADD_SOURCE_DIR(lib/PoissonRecon LIB_POISSON_RECON_SRCS *.h *.cpp *.inl) + COLMAP_ADD_SOURCE_DIR(lib/SiftGPU LIB_SIFT_GPU_SRCS *.h *.cpp *.cu) +-COLMAP_ADD_SOURCE_DIR(lib/SQLite LIB_SQLITE_SRCS *.h *.c) +-COLMAP_ADD_SOURCE_DIR(lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc) ++# COLMAP_ADD_SOURCE_DIR(lib/SQLite LIB_SQLITE_SRCS *.h *.c) ++# COLMAP_ADD_SOURCE_DIR(lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc) + + COLMAP_ADD_SOURCE_DIR(src/base BASE_SRCS *.h *.cc) + COLMAP_ADD_SOURCE_DIR(src/controllers CONTROLLERS_SRCS *.h *.cc) +@@ -401,14 +412,14 @@ COLMAP_ADD_SOURCE_DIR(src/util UTIL_SRCS *.h *.cc) + # intellisense can't find any of the included files). + add_library( + ${COLMAP_SRC_ROOT_FOLDER} +- ${LIB_FLANN_SRCS} ++ # ${LIB_FLANN_SRCS} + ${LIB_GRACLUS_SRCS} + ${LIB_LSD_SRCS} + ${LIB_PBA_SRCS} + ${LIB_POISSON_RECON_SRCS} + ${LIB_SIFT_GPU_SRCS} +- ${LIB_SQLITE_SRCS} +- ${LIB_VLFEAT_SRCS} ++ # ${LIB_SQLITE_SRCS} ++ # ${LIB_VLFEAT_SRCS} + ${BASE_SRCS} + ${CONTROLLERS_SRCS} + ${ESTIMATORS_SRCS} +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 54aab8db7..ea9d0e4c7 100755 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -35,11 +35,11 @@ elseif(IS_GNU OR IS_CLANG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + endif() + +-add_subdirectory(FLANN) ++# add_subdirectory(FLANN) + add_subdirectory(Graclus) + add_subdirectory(LSD) + add_subdirectory(PBA) + add_subdirectory(PoissonRecon) + add_subdirectory(SiftGPU) +-add_subdirectory(SQLite) +-add_subdirectory(VLFeat) ++# add_subdirectory(SQLite) ++# add_subdirectory(VLFeat) +--- /dev/null 2021-07-26 16:13:59.421873396 +1000 ++++ b/cmake/FindVLFEAT.cmake 2021-07-27 08:37:45.530591354 +1000 +@@ -0,0 +1,42 @@ ++# - Find the VLFEAT library (http://www.vlfeat.org/) ++# If VLFEAT is installed in an unusual location, define VLFEAT_ROOT. ++# This module defines the following variables: ++# VLFEAT_INCLUDE_DIR, where to find the VLFEAT include files ++# VLFEAT_LIBRARIES, the libraries needed to use VLFEAT. ++# VLFEAT_FOUND, If false, do not try to use VLFEAT. ++ ++#============================================================================= ++# Copyright 2014 Roman Hiestand ++# ++# Distributed under the MIT License. ++# ++# This software is distributed WITHOUT ANY WARRANTY; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# See the License for more information. ++#============================================================================= ++ ++FIND_PATH(VLFEAT_INCLUDE_DIR vl/generic.h ++ PATHS ++ /usr/local/include ++ /usr/include ++ ${VLFEAT_ROOT}/include ++ DOC "Location of VLFEAT Headers" ++) ++ ++FIND_LIBRARY(VLFEAT_LIBRARY ++ NAMES vl libvl ++ PATHS /usr/lib /usr/local/lib ${VLFEAT_ROOT}/lib ++) ++ ++# Handle the QUIETLY and REQUIRED arguments and set VLFEAT_FOUND to TRUE ++INCLUDE(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(VLFEAT DEFAULT_MSG ++ VLFEAT_LIBRARY VLFEAT_INCLUDE_DIR) ++ ++IF(VLFEAT_FOUND) ++ SET(VLFEAT_LIBRARIES ${VLFEAT_LIBRARY}) ++ SET(VLFEAT_INCLUDE_DIRS ${VLFEAT_INCLUDE_DIR}) ++ENDIF(VLFEAT_FOUND) ++ ++MARK_AS_ADVANCED(VLFEAT_INCLUDE_DIR VLFEAT_LIBRARY VLFEAT_LIBRARIES) ++ From cb7c59201802b87f6d1d3568110b6d72dede082b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 07:43:45 +1000 Subject: [PATCH 09/17] Update meta.yaml --- recipe/meta.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2a5a7c..a13e115 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,7 @@ source: sha256: ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55 patches: - fix_build.patch + - unvendor_libs.patch # [unix] build: number: {{ build }} @@ -72,14 +73,14 @@ requirements: - ceres-solver - qt-main - git - - flann - - sqlite - - vlfeat + - flann # [unix] + - sqlite # [unix] + - vlfeat # [unix] - gmp # [unix] run: - boost-cpp - - vlfeat - - flann + - vlfeat # [unix] + - flann # [unix] - xorg-libxext # [unix] - xorg-libxdmcp # [unix] - xorg-libxau # [unix] From a0bb5e1fd9fcb95869687b93b76ccaaa4f94103c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 07:45:54 +1000 Subject: [PATCH 10/17] Create boost1780.yaml --- .ci_support/migrations/boost1780.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .ci_support/migrations/boost1780.yaml diff --git a/.ci_support/migrations/boost1780.yaml b/.ci_support/migrations/boost1780.yaml new file mode 100644 index 0000000..9933373 --- /dev/null +++ b/.ci_support/migrations/boost1780.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 3 +boost: +- 1.78.0 +boost_cpp: +- 1.78.0 +migrator_ts: 1662825971 From 4a03b4365df8bf728b9350a0a8ff8b1b906d4a34 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 21:48:45 +0000 Subject: [PATCH 11/17] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.12.04.26.16 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 82 ------------------- ...ler_version11.1cxx_compiler_version10.yaml | 2 +- ...ler_version11.2cxx_compiler_version10.yaml | 2 +- ...ler_versionNonecxx_compiler_version10.yaml | 2 +- ...iler_version10.2cxx_compiler_version7.yaml | 2 +- ...iler_version11.0cxx_compiler_version9.yaml | 2 +- .ci_support/migrations/vlfeat0921.yaml | 7 -- .ci_support/osx_64_.yaml | 8 +- .ci_support/osx_arm64_.yaml | 8 +- .ci_support/win_64_.yaml | 39 --------- README.md | 7 -- azure-pipelines.yml | 1 - 13 files changed, 14 insertions(+), 150 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml delete mode 100644 .ci_support/migrations/vlfeat0921.yaml delete mode 100644 .ci_support/win_64_.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f42..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 8a0bcae..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,82 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2019 - strategy: - matrix: - win_64_: - CONFIG: win_64_ - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - - steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - - script: | - call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe - env: - PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml index 9ed5eff..1e38275 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml @@ -1,5 +1,5 @@ boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml index 930d541..86200ef 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -1,5 +1,5 @@ boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml index 8bacfe1..ebf55c3 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml @@ -1,5 +1,5 @@ boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml index c5c109b..2fea5b5 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml @@ -1,5 +1,5 @@ boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml index d332e84..1652f96 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml @@ -1,5 +1,5 @@ boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/migrations/vlfeat0921.yaml b/.ci_support/migrations/vlfeat0921.yaml deleted file mode 100644 index 39b4e3a..0000000 --- a/.ci_support/migrations/vlfeat0921.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1651527258.206809 -vlfeat: -- 0.9.21 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e100501..a2a1fbc 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -15,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' flann: - 1.9.1 gflags: @@ -27,7 +27,7 @@ glog: gmp: - '6' llvm_openmp: -- '13' +- '14' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2cb1289..d9c91a0 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' boost_cpp: -- 1.74.0 +- 1.78.0 c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -15,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' flann: - 1.9.1 gflags: @@ -27,7 +27,7 @@ glog: gmp: - '6' llvm_openmp: -- '13' +- '14' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml deleted file mode 100644 index 72e2383..0000000 --- a/.ci_support/win_64_.yaml +++ /dev/null @@ -1,39 +0,0 @@ -boost_cpp: -- 1.74.0 -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -flann: -- 1.9.1 -gflags: -- '2.2' -glew: -- '2.1' -glog: -- '0.6' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - flann: - max_pin: x.x.x - glew: - max_pin: x.x - sqlite: - max_pin: x - vlfeat: - max_pin: x.x.x -qt_main: -- '5.15' -sqlite: -- '3' -suitesparse: -- '5' -target_platform: -- win-64 -vlfeat: -- 0.9.21 diff --git a/README.md b/README.md index 8304b6d..d3a6b7d 100644 --- a/README.md +++ b/README.md @@ -75,13 +75,6 @@ Current build status variant - - win_64 - - - variant - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..33a441c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From 75c498260f5cedaaf4c1898e176f61714315e05c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 08:09:15 +1000 Subject: [PATCH 12/17] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a13e115..f9ae950 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: build: number: {{ build }} - skip: true # [win or (osx and cuda_compiler_version != "None")] + skip: true # [osx and cuda_compiler_version != "None"] string: {{ processor }}h{{ PKG_HASH }}_{{ build }} run_exports: - {{ pin_subpackage('colmap', max_pin='x.x') }} From f5f0dcafd57a20ea29fd721aac6f11f6a05b07d0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 22:13:24 +0000 Subject: [PATCH 13/17] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.12.04.26.16 --- .azure-pipelines/azure-pipelines-win.yml | 94 +++++++++++++++++++ .../win_64_cuda_compiler_version10.2.yaml | 31 ++++++ .../win_64_cuda_compiler_version11.0.yaml | 31 ++++++ .../win_64_cuda_compiler_version11.1.yaml | 31 ++++++ .../win_64_cuda_compiler_version11.2.yaml | 31 ++++++ .../win_64_cuda_compiler_versionNone.yaml | 31 ++++++ README.md | 35 +++++++ azure-pipelines.yml | 1 + 8 files changed, 285 insertions(+) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_cuda_compiler_version10.2.yaml create mode 100644 .ci_support/win_64_cuda_compiler_version11.0.yaml create mode 100644 .ci_support/win_64_cuda_compiler_version11.1.yaml create mode 100644 .ci_support/win_64_cuda_compiler_version11.2.yaml create mode 100644 .ci_support/win_64_cuda_compiler_versionNone.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..9e2c39b --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,94 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2019 + strategy: + matrix: + win_64_cuda_compiler_version10.2: + CONFIG: win_64_cuda_compiler_version10.2 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.0: + CONFIG: win_64_cuda_compiler_version11.0 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.1: + CONFIG: win_64_cuda_compiler_version11.1 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.2: + CONFIG: win_64_cuda_compiler_version11.2 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + - script: | + call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml new file mode 100644 index 0000000..8d9224b --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -0,0 +1,31 @@ +boost_cpp: +- 1.78.0 +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cxx_compiler: +- vs2019 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.6' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + glew: + max_pin: x.x +qt_main: +- '5.15' +suitesparse: +- '5' +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compiler_version11.0.yaml new file mode 100644 index 0000000..9ae0818 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.0.yaml @@ -0,0 +1,31 @@ +boost_cpp: +- 1.78.0 +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.0' +cxx_compiler: +- vs2019 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.6' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + glew: + max_pin: x.x +qt_main: +- '5.15' +suitesparse: +- '5' +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compiler_version11.1.yaml new file mode 100644 index 0000000..edbd344 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.1.yaml @@ -0,0 +1,31 @@ +boost_cpp: +- 1.78.0 +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.1' +cxx_compiler: +- vs2019 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.6' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + glew: + max_pin: x.x +qt_main: +- '5.15' +suitesparse: +- '5' +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml new file mode 100644 index 0000000..f12d060 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -0,0 +1,31 @@ +boost_cpp: +- 1.78.0 +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- vs2019 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.6' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + glew: + max_pin: x.x +qt_main: +- '5.15' +suitesparse: +- '5' +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml new file mode 100644 index 0000000..1e8cec1 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -0,0 +1,31 @@ +boost_cpp: +- 1.78.0 +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- vs2019 +gflags: +- '2.2' +glew: +- '2.1' +glog: +- '0.6' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + glew: + max_pin: x.x +qt_main: +- '5.15' +suitesparse: +- '5' +target_platform: +- win-64 diff --git a/README.md b/README.md index d3a6b7d..69acb60 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,41 @@ Current build status variant + + win_64_cuda_compiler_version10.2 + + + variant + + + + win_64_cuda_compiler_version11.0 + + + variant + + + + win_64_cuda_compiler_version11.1 + + + variant + + + + win_64_cuda_compiler_version11.2 + + + variant + + + + win_64_cuda_compiler_versionNone + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From 84b558af1c1013da6e5dd5d7ce3d8bd1763f46d3 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 13 Sep 2022 08:20:32 +1000 Subject: [PATCH 14/17] Delete conda_build_config.yaml --- recipe/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 205954a..0000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# boost-cpp: # [win] -# - 1.76 # [win] From effd89116960caaf5d39e01062544c0b6db0c9ac Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 18 Sep 2022 09:37:14 +1000 Subject: [PATCH 15/17] Blas --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f9ae950..1d9588c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -62,6 +62,8 @@ requirements: - xorg-libsm # [unix] - libglu # [linux] # deps + - libblas + - libcblas - boost-cpp - suitesparse - eigen From a455f5a020f5b88e2165c9549f7033d6755e30be Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:42:10 +0000 Subject: [PATCH 16/17] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.21.03.28.44 --- ...uda_compiler_version11.1cxx_compiler_version10.yaml | 10 ++++------ ...uda_compiler_version11.2cxx_compiler_version10.yaml | 10 ++++------ ...uda_compiler_versionNonecxx_compiler_version10.yaml | 10 ++++------ ...cuda_compiler_version10.2cxx_compiler_version7.yaml | 10 ++++------ ...cuda_compiler_version11.0cxx_compiler_version9.yaml | 10 ++++------ .ci_support/osx_64_.yaml | 10 ++++------ .ci_support/osx_arm64_.yaml | 10 ++++------ .ci_support/win_64_cuda_compiler_version10.2.yaml | 6 ++++-- .ci_support/win_64_cuda_compiler_version11.0.yaml | 6 ++++-- .ci_support/win_64_cuda_compiler_version11.1.yaml | 6 ++++-- .ci_support/win_64_cuda_compiler_version11.2.yaml | 6 ++++-- .ci_support/win_64_cuda_compiler_versionNone.yaml | 6 ++++-- 12 files changed, 48 insertions(+), 52 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml index 1e38275..a368d84 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml @@ -30,17 +30,15 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml index 86200ef..75a4545 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -30,17 +30,15 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml index ebf55c3..ba41c25 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml @@ -30,17 +30,15 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml index 2fea5b5..1551eca 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml @@ -30,17 +30,15 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml index 1652f96..3418e26 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml @@ -30,17 +30,15 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a2a1fbc..ddae98f 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -26,6 +26,10 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib llvm_openmp: - '14' macos_machine: @@ -35,12 +39,6 @@ pin_run_as_build: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d9c91a0..d14553a 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -26,6 +26,10 @@ glog: - '0.6' gmp: - '6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib llvm_openmp: - '14' macos_machine: @@ -35,12 +39,6 @@ pin_run_as_build: max_pin: x.x.x flann: max_pin: x.x.x - glew: - max_pin: x.x - gmp: - max_pin: x - sqlite: - max_pin: x vlfeat: max_pin: x.x.x qt_main: diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml index 8d9224b..5afe4c3 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -18,11 +18,13 @@ glew: - '2.1' glog: - '0.6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x - glew: - max_pin: x.x qt_main: - '5.15' suitesparse: diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compiler_version11.0.yaml index 9ae0818..2bbffa0 100644 --- a/.ci_support/win_64_cuda_compiler_version11.0.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.0.yaml @@ -18,11 +18,13 @@ glew: - '2.1' glog: - '0.6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x - glew: - max_pin: x.x qt_main: - '5.15' suitesparse: diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compiler_version11.1.yaml index edbd344..b157afd 100644 --- a/.ci_support/win_64_cuda_compiler_version11.1.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.1.yaml @@ -18,11 +18,13 @@ glew: - '2.1' glog: - '0.6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x - glew: - max_pin: x.x qt_main: - '5.15' suitesparse: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml index f12d060..a0f45ca 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -18,11 +18,13 @@ glew: - '2.1' glog: - '0.6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x - glew: - max_pin: x.x qt_main: - '5.15' suitesparse: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 1e8cec1..6a6e4fe 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -18,11 +18,13 @@ glew: - '2.1' glog: - '0.6' +libblas: +- 3.9 *netlib +libcblas: +- 3.9 *netlib pin_run_as_build: boost-cpp: max_pin: x.x.x - glew: - max_pin: x.x qt_main: - '5.15' suitesparse: From 716e2597921c9d29350d00937d9fbbe82dbaa6e1 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 22 Oct 2022 11:26:10 +1000 Subject: [PATCH 17/17] NOMINMAX --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 443a577..bbf4bbf 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,6 +7,7 @@ cmake ^ -DCMAKE_BUILD_TYPE=Release ^ -DBOOST_STATIC=OFF ^ -DCUDA_ENABLED=OFF ^ + -DCMAKE_CXX_FLAGS=-DNOMINMAX ^ %SRC_DIR% if errorlevel 1 exit 1