From c44ee466b944311a515fe99ff14102833049e50b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 15:07:03 +0200 Subject: [PATCH 1/7] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3064a3..a7d8af4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,6 @@ source: build: number: 0 - skip: true # [win] run_exports: - {{ pin_subpackage('ipopt', max_pin='x.x') }} From 75c64eaa660f39f4447acc71ed0fdc1017504414 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 2 Jul 2021 13:09:00 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and conda-forge-pinning 2021.07.02.12.06.00 --- .azure-pipelines/azure-pipelines-win.yml | 110 +++++++++++++++++++++++ .ci_support/win_64_.yaml | 25 ++++++ README.md | 7 ++ azure-pipelines.yml | 1 + 4 files changed, 143 insertions(+) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..1fd8ea1 --- /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: vs2017-win2016 + 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.6 conda-build conda "conda-forge-ci-setup=3" pip' # 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 build "recipe" -m .ci_support\%CONFIG%.yaml + 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'))) \ No newline at end of file diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml new file mode 100644 index 0000000..dc40695 --- /dev/null +++ b/.ci_support/win_64_.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +fortran_compiler: +- flang +fortran_compiler_version: +- '5' +libblas: +- 3.8 *netlib +liblapack: +- 3.8 *netlib +metis: +- '5.1' +mumps_seq: +- '5.2' +pin_run_as_build: + metis: + max_pin: x.x +target_platform: +- win-64 diff --git a/README.md b/README.md index 57f9dfb..fbce22f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,13 @@ Current build status variant + + win_64 + + + 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 910ab203143197b9818c0a025d38ac0919ff2e47 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 17:56:49 +0200 Subject: [PATCH 3/7] CMake: Add new files in Ipopt 3.14 and remove removed files --- recipe/cmake/Ipopt/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/recipe/cmake/Ipopt/CMakeLists.txt b/recipe/cmake/Ipopt/CMakeLists.txt index bd0a9fd..5ee8c19 100644 --- a/recipe/cmake/Ipopt/CMakeLists.txt +++ b/recipe/cmake/Ipopt/CMakeLists.txt @@ -135,7 +135,8 @@ set (IPOPT_SRC_ALGORITHM_INEXACT_LIST ${Ipopt_DIR}/src/Algorithm/Inexact/IpInexa ${Ipopt_DIR}/src/Algorithm/Inexact/IpInexactPDTerminationTester.cpp ${Ipopt_DIR}/src/Algorithm/Inexact/IpIterativePardisoSolverInterface.cpp) -set (IPOPT_SRC_ALGORITHM_LINEARSOLVERS_LIST ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpLinearSolversRegOp.cpp +set (IPOPT_SRC_ALGORITHM_LINEARSOLVERS_LIST ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpLinearSolvers.c + ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpLinearSolversRegOp.cpp ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpSlackBasedTSymScalingMethod.cpp ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpTripletToCSRConverter.cpp ${Ipopt_DIR}/src/Algorithm/LinearSolvers/IpTSymDependencyDetector.cpp @@ -188,15 +189,8 @@ set (IPOPT_SRC_CONTRIB_CGPENALTY_LIST ${Ipopt_DIR}/src/contrib/CGPenalty/IpCGPen ${Ipopt_DIR}/src/contrib/CGPenalty/IpCGSearchDirCalc.cpp ${Ipopt_DIR}/src/contrib/CGPenalty/IpPiecewisePenalty.cpp) -set (IPOPT_SRC_CONTRIB_LINEARSOLVERLOADER_LIST ${Ipopt_DIR}/src/contrib/LinearSolverLoader/LibraryHandler.c - ${Ipopt_DIR}/src/contrib/LinearSolverLoader/HSLLoader.c) - -if (IPOPT_ENABLE_LINEARSOLVERLOADER) - set(IPOPT_SRC_CONTRIB_LINEARSOLVERLOADER_LIST ${IPOPT_SRC_CONTRIB_LINEARSOLVERLOADER_LIST} - ${Ipopt_DIR}/src/contrib/LinearSolverLoader/PardisoLoader.c) -endif () - -set (IPOPT_SRC_COMMON_LIST ${Ipopt_DIR}/src/Common/IpJournalist.cpp +set (IPOPT_SRC_COMMON_LIST ${Ipopt_DIR}/src/Common/IpLibraryLoader.cpp + ${Ipopt_DIR}/src/Common/IpJournalist.cpp ${Ipopt_DIR}/src/Common/IpObserver.cpp ${Ipopt_DIR}/src/Common/IpOptionsList.cpp ${Ipopt_DIR}/src/Common/IpRegOptions.cpp @@ -245,7 +239,6 @@ set (IPOPT_SRC_LIST ${IPOPT_SRC_ALGORITHM_LIST} ${IPOPT_SRC_APPS_CUTERINTERFACE_LIST} ${IPOPT_SRC_APPS_AMPLSOLVER_LIST} ${IPOPT_SRC_CONTRIB_CGPENALTY_LIST} - ${IPOPT_SRC_CONTRIB_LINEARSOLVERLOADER_LIST} ${IPOPT_SRC_COMMON_LIST} ${IPOPT_SRC_INTERFACES_LIST} ${IPOPT_SRC_LINALG_LIST} @@ -910,6 +903,7 @@ set(COMMON_HDRS ${Ipopt_DIR}/src/Common/IpCachedResults.hpp ${Ipopt_DIR}/src/Common/IpDebug.hpp ${Ipopt_DIR}/src/Common/IpException.hpp ${Ipopt_DIR}/src/Common/IpJournalist.hpp + ${Ipopt_DIR}/src/Common/IpLibraryLoader.hpp ${Ipopt_DIR}/src/Common/IpObserver.hpp ${Ipopt_DIR}/src/Common/IpOptionsList.hpp ${Ipopt_DIR}/src/Common/IpReferenced.hpp From 41eed7146b6614e9852aec65bf385b7469fc78bf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 18:03:26 +0200 Subject: [PATCH 4/7] 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 a7d8af4..2ff7cfb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - pkg-config-do-not-add-requires-private.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage('ipopt', max_pin='x.x') }} From e8a9f376e57f5c3c470f43a2bc8b313d7e742f7e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 18:25:37 +0200 Subject: [PATCH 5/7] Update CMakeLists.txt --- recipe/cmake/Ipopt/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/cmake/Ipopt/CMakeLists.txt b/recipe/cmake/Ipopt/CMakeLists.txt index 5ee8c19..a5b3a7b 100644 --- a/recipe/cmake/Ipopt/CMakeLists.txt +++ b/recipe/cmake/Ipopt/CMakeLists.txt @@ -203,6 +203,7 @@ set (IPOPT_SRC_INTERFACES_LIST ${Ipopt_DIR}/src/Interfaces/IpInterfacesRegOp.cpp ${Ipopt_DIR}/src/Interfaces/IpStdCInterface.cpp ${Ipopt_DIR}/src/Interfaces/IpStdFInterface.c ${Ipopt_DIR}/src/Interfaces/IpStdInterfaceTNLP.cpp + ${Ipopt_DIR}/src/Interfaces/IpTNLP.cpp ${Ipopt_DIR}/src/Interfaces/IpTNLPAdapter.cpp ${Ipopt_DIR}/src/Interfaces/IpTNLPReducer.cpp) From 69d85d5971dc79517975e7f5129db9837e0db625 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 18:54:05 +0200 Subject: [PATCH 6/7] Update CMakeLists.txt --- recipe/cmake/Ipopt/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/cmake/Ipopt/CMakeLists.txt b/recipe/cmake/Ipopt/CMakeLists.txt index a5b3a7b..8f361b0 100644 --- a/recipe/cmake/Ipopt/CMakeLists.txt +++ b/recipe/cmake/Ipopt/CMakeLists.txt @@ -912,6 +912,7 @@ set(COMMON_HDRS ${Ipopt_DIR}/src/Common/IpCachedResults.hpp ${Ipopt_DIR}/src/Common/IpSmartPtr.hpp ${Ipopt_DIR}/src/Common/IpTaggedObject.hpp ${Ipopt_DIR}/src/Common/IpTimedTask.hpp + ${Ipopt_DIR}/src/Common/IpTypes.h ${Ipopt_DIR}/src/Common/IpTypes.hpp ${Ipopt_DIR}/src/Common/IpUtils.hpp) From 1bc668f8da1331b3940a083756b8eca77b439432 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 2 Jul 2021 23:37:44 +0200 Subject: [PATCH 7/7] 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 2ff7cfb..a7d8af4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - pkg-config-do-not-add-requires-private.patch build: - number: 1 + number: 0 run_exports: - {{ pin_subpackage('ipopt', max_pin='x.x') }}