From 7eb672eeeeddea979ceafe463ba9e40038a01be6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 17 Sep 2022 17:45:10 +0000 Subject: [PATCH 1/2] Rebuild for boost1780 --- .ci_support/migrations/boost1780.yaml | 9 +++++++++ conda-forge.yml | 6 +++--- recipe/meta.yaml | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) 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 diff --git a/conda-forge.yml b/conda-forge.yml index 54e9c15..9b90e19 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,9 @@ +build_platform: + osx_arm64: osx_64 conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -build_platform: - osx_arm64: osx_64 -test_on_native_only: true os_version: linux_64: cos7 +test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3be6b7f..a2a5a7c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "colmap" %} {% set version = "3.7" %} -{% set build = 5 %} +{% set build = 6 %} {% set processor = "cpu" if cuda_compiler_version == "None" else "gpu" %} # [not osx] {% set processor = "cpu" %} # [osx] From 392e76fd5d20a46d11d819c3f41e5c7e75f06c46 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 17 Sep 2022 17:46:07 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.13.20.27.40 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- ...10cuda_compiler_version11.1cxx_compiler_version10.yaml | 2 +- ...10cuda_compiler_version11.2cxx_compiler_version10.yaml | 2 +- ...10cuda_compiler_versionNonecxx_compiler_version10.yaml | 2 +- ...on7cuda_compiler_version10.2cxx_compiler_version7.yaml | 2 +- ...on9cuda_compiler_version11.0cxx_compiler_version9.yaml | 2 +- .ci_support/migrations/vlfeat0921.yaml | 7 ------- .ci_support/osx_64_.yaml | 8 ++++---- .ci_support/osx_arm64_.yaml | 8 ++++---- 9 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 .ci_support/migrations/vlfeat0921.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/.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: