From fbd52f7795ef1e46aff38250c0448c1fbf8f5a91 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Thu, 21 Jan 2021 11:00:01 -0800 Subject: [PATCH 01/39] Use 4.2 codebase --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee45ebc..835bd9d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # conda-opensim -Unofficial conda recipe for OpenSim 4.0-alpha +Unofficial conda recipe for OpenSim 4.2 Usage: @@ -8,4 +8,4 @@ Usage: For python 3, use the python3 branch and - conda build opensim --python 3.5 + conda build opensim --python 3.7 From 3bf6ca2b5e89e0fba8228f95b3f094348aa8d36d Mon Sep 17 00:00:00 2001 From: aymanhab Date: Fri, 22 Jan 2021 20:26:19 -0800 Subject: [PATCH 02/39] Use VS 2019, 4.2Beta code base dependencies build ok so far --- opensim/bld.bat | 4 ++-- opensim/build.sh | 2 +- opensim/meta.yaml | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index 2676419..c589737 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -1,7 +1,7 @@ mkdir opensim_dependencies_build cd .\opensim_dependencies_build cmake ..\dependencies^ - -G"Visual Studio 14 2015 Win64"^ + -G"Visual Studio 16 2019"^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" cmake --build . --config Release -- /maxcpucount:8 cd .. @@ -9,7 +9,7 @@ cd .. mkdir opensim_build cd .\opensim_build cmake ..\^ - -G"Visual Studio 14 2015 Win64"^ + -G"Visual Studio 16 2019"^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ -DBUILD_PYTHON_WRAPPING=ON^ diff --git a/opensim/build.sh b/opensim/build.sh index 663be19..6628664 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -24,7 +24,7 @@ cmake ../ \ -DBUILD_PYTHON_WRAPPING=ON \ -DBUILD_JAVA_WRAPPING=OFF \ -DPYTHON_VERSION_MAJOR=3 \ - -DPYTHON_VERSION_MINOR=6 \ + -DPYTHON_VERSION_MINOR=7 \ -DWITH_BTK=ON make -j8 make install diff --git a/opensim/meta.yaml b/opensim/meta.yaml index c4c048d..af626b5 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,24 +1,17 @@ package: name: opensim - version: "4.0.0" - -#source: -# fn: OpenSim-40-source.zip -# url: https://github.com/opensim-org/opensim-core/archive/v4.0.0_alpha.zip -# sha256: dd425e886f394098533142652e246b375c8fb4d69246f0ffffcdd63bbbdb39c3 + version: "4.2.beta" source: # path: /home/kidzik/workspace/opensim-core git_url: https://github.com/opensim-org/opensim-core.git - git_rev: 399c8d57a779dd5dde2916192f8b92bfc959e269 #beta + git_rev: 642235af4d6db20cf5e5ac066d9ee8fbf9a08c4d #4.2 build: number: 12 - # NOTE : For C++11 builds, vc14/VS 2015 are the only acceptable targets - # which only Python 3.5 supports. So skip previous Python versions. - # skip: true # [win and not py35] + # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - - vc14 # [win and py35] + - vc16 # [win and py35] # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. detect_binary_files_with_prefix: true @@ -26,7 +19,8 @@ build: requirements: run: - python - - openblas + - numpy + # - openblas - freeglut build: - swig @@ -44,4 +38,5 @@ about: extra: recipe-maintainers: + - aymanhab - kidzik From 70ad8c7e9fddc63ac950fca45fadc4c8a65cd125 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 27 Jan 2021 20:02:55 -0800 Subject: [PATCH 03/39] Add numpy dependency and allow opensim to build to completion on windows --- opensim/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index af626b5..ab8152d 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -25,8 +25,9 @@ requirements: build: - swig - toolchain - - cmake >=2.8.6 + - cmake >=3.15 - python + - numpy # - python # [win] about: From 8191f67761d8439809892067d4a063fd5942ba03 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Thu, 28 Jan 2021 10:40:19 -0800 Subject: [PATCH 04/39] Force python 3.7 --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index ab8152d..cdbcb59 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -26,7 +26,7 @@ requirements: - swig - toolchain - cmake >=3.15 - - python + - python >=3.7 - numpy # - python # [win] From ef4aa35355eb05b3bc9fa29f719a0f7255f0cd87 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Thu, 28 Jan 2021 11:52:03 -0800 Subject: [PATCH 05/39] Update .travis.yml Test python 3.7 before retiring travis and moving to github Actions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ca3c35..2f6bd73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: # We don't actually use the Travis Python, but this keeps it organized. - - "2.7" + - "3.7" install: - sudo apt-get update # We do this conditionally because it saves us some downloading if the @@ -24,4 +24,4 @@ install: - conda-build opensim script: - # Your test script goes here \ No newline at end of file + # Your test script goes here From f63a1362c43cea3755afc68a5e5eb3742e3944bb Mon Sep 17 00:00:00 2001 From: aymanhab Date: Fri, 29 Jan 2021 21:52:14 -0800 Subject: [PATCH 06/39] Successful build on linux ubuntu, packaging in progress --- opensim/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/build.sh b/opensim/build.sh index 663be19..6628664 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -24,7 +24,7 @@ cmake ../ \ -DBUILD_PYTHON_WRAPPING=ON \ -DBUILD_JAVA_WRAPPING=OFF \ -DPYTHON_VERSION_MAJOR=3 \ - -DPYTHON_VERSION_MINOR=6 \ + -DPYTHON_VERSION_MINOR=7 \ -DWITH_BTK=ON make -j8 make install From e2c88cfadcc1125e05c62c57ecb1549ffb90ca56 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 14 Apr 2021 23:38:26 -0700 Subject: [PATCH 07/39] Update rev to commit built with swig 4.0 --- opensim/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index cdbcb59..5a667c1 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,11 +1,11 @@ package: name: opensim - version: "4.2.beta" + version: "4.2.0414" source: # path: /home/kidzik/workspace/opensim-core git_url: https://github.com/opensim-org/opensim-core.git - git_rev: 642235af4d6db20cf5e5ac066d9ee8fbf9a08c4d #4.2 + git_rev: "dbde45530883b4755f2933a9aa1231975313dd3c" build: number: 12 @@ -27,7 +27,7 @@ requirements: - toolchain - cmake >=3.15 - python >=3.7 - - numpy + - numpy >=1.19 # - python # [win] about: From b5a638429876339bd5eac0b5105e0df76dfae40f Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 14 Apr 2021 23:46:19 -0700 Subject: [PATCH 08/39] Refresh variables in build script to correspond to master commit with swig 4.0 --- opensim/bld.bat | 7 +++++-- opensim/build.sh | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index c589737..4934063 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -2,7 +2,8 @@ mkdir opensim_dependencies_build cd .\opensim_dependencies_build cmake ..\dependencies^ -G"Visual Studio 16 2019"^ - -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" + -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ + -DSUPERBUILD_ezc3d=ON cmake --build . --config Release -- /maxcpucount:8 cd .. @@ -13,7 +14,9 @@ cmake ..\^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ -DBUILD_PYTHON_WRAPPING=ON^ - -DWITH_BTK=ON + -DOPENSIM_C3D_PARSER=ezc3d^ + -DOPENSIM_PYTHON_CONDA=ON^ + -DBUILD_TESTING=OFF cmake --build . --target install --config Release -- /maxcpucount:8 cp %LIBRARY_PREFIX%\simbody\bin\simbody-visualizer.exe %PREFIX%\simbody-visualizer.exe diff --git a/opensim/build.sh b/opensim/build.sh index 6628664..364df7f 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -7,11 +7,11 @@ mkdir opensim_dependencies_build cd opensim_dependencies_build cmake ../dependencies/ \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DSUPERBUILD_ezc3d=ON make -j8 cd .. -cp -r $PREFIX/BTK/lib/btk-0.4dev/* $PREFIX/lib/ cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ # TODO: Tests are missing! @@ -22,9 +22,10 @@ cmake ../ \ -DCMAKE_BUILD_TYPE=Release \ -DOPENSIM_DEPENDENCIES_DIR="$PREFIX" \ -DBUILD_PYTHON_WRAPPING=ON \ - -DBUILD_JAVA_WRAPPING=OFF \ + -DOPENSIM_PYTHON_CONDA=ON \ -DPYTHON_VERSION_MAJOR=3 \ -DPYTHON_VERSION_MINOR=7 \ - -DWITH_BTK=ON + -DOPENSIM_C3D_PARSER=ezc3d \ + -DBUILD_TESTING=OFF make -j8 make install From 3192284a490793488e6cc75759d1de3c28b2c88e Mon Sep 17 00:00:00 2001 From: aymanhab Date: Thu, 15 Apr 2021 00:15:21 -0700 Subject: [PATCH 09/39] rename cp to copy in bat file --- opensim/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index 4934063..8b2ebff 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -19,6 +19,6 @@ cmake ..\^ -DBUILD_TESTING=OFF cmake --build . --target install --config Release -- /maxcpucount:8 -cp %LIBRARY_PREFIX%\simbody\bin\simbody-visualizer.exe %PREFIX%\simbody-visualizer.exe +copy %LIBRARY_PREFIX%\simbody\bin\simbody-visualizer.exe %PREFIX%\simbody-visualizer.exe cd %LIBRARY_PREFIX%\sdk\python python setup.py install From 5ea801fe9e9404623af20a077aa18499aeabe06b Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 19 Apr 2021 11:40:57 -0700 Subject: [PATCH 10/39] Add ci file, windows only --- .github/workflows/continuous_integration.yml | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/continuous_integration.yml diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml new file mode 100644 index 0000000..6f58622 --- /dev/null +++ b/.github/workflows/continuous_integration.yml @@ -0,0 +1,49 @@ +name: continuous-integration + +# syntax https://help.github.com/en/articles/workflow-syntax-for-github-actions +on: + # Run at 2am every night. + schedule: + - cron: '0 2 * * *' + pull_request: + branches: + - '*' + +jobs: + windows: + name: Windows + + runs-on: windows-latest + + steps: + - name: Install Python packages + uses: actions/setup-python@v2 + with: + python-version: '3.7' + + - uses: conda-incubator/setup-miniconda@v2 + with: + auto-update-conda: true + miniconda-version: "latest" + + - name: Run build + #Need numpy to use SWIG numpy typemaps. + run: conda build opensim + + style: + name: Style + + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@v1 + + - name: Check for tabs + # Ensure that there are no tabs in source code. + # GREP returns 0 (true) if there are any matches, and + # we don't want any matches. If there are matches, + # print a helpful message, and make the test fail by using "false". + # The GREP command here checks for any tab characters in the the files + # that match the specified pattern. GREP does not pick up explicit tabs + # (e.g., literally a \t in a source file). + run: if grep --line-num --recursive --exclude-dir="*dependencies*" --exclude-dir="*snopt*" --include={CMakeLists.txt,*.cpp,*.c,*.h} -P "\t" . ; then echo "Tabs found in the lines shown above. See CONTRIBUTING.md about tabs."; false; fi From b3e8ea474043029d6c5571382a0e5968795e3e4c Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 11:48:17 -0700 Subject: [PATCH 11/39] Update continuous_integration.yml Install conda-build --- .github/workflows/continuous_integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 6f58622..106b6ab 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -25,7 +25,8 @@ jobs: with: auto-update-conda: true miniconda-version: "latest" - + - name: Install conda-build + run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. run: conda build opensim From f2597b360b949aaf02269c1e0f33b9654c5cc540 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 19 Apr 2021 12:52:46 -0700 Subject: [PATCH 12/39] try different path in ci --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 106b6ab..d0d35ed 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,7 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build opensim + run: conda build conda-opensim/opensim style: name: Style From 19669b5092cade5b260af80478426a10ebd82554 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:09:48 -0700 Subject: [PATCH 13/39] Update continuous_integration.yml try with -m cli --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index d0d35ed..9c9ce82 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,7 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build conda-opensim/opensim + run: conda build . -m C:\conda-opensim\opensim\meta.yaml style: name: Style From 36b3d6ae627732ae25fe1952bcc030ce27e83053 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:12:43 -0700 Subject: [PATCH 14/39] Update continuous_integration.yml fix syntax --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 9c9ce82..f2a8879 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,7 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build . -m C:\conda-opensim\opensim\meta.yaml + run: conda build -m C:\conda-opensim\opensim\meta.yaml style: name: Style From 472137e2713d91b791fbc0b1891ec2ae9d5ab4cd Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 19 Apr 2021 13:23:57 -0700 Subject: [PATCH 15/39] use path for recipe --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index f2a8879..d9a6411 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,7 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build -m C:\conda-opensim\opensim\meta.yaml + run: conda build RECIPE_PATH C:\conda-opensim\opensim\ style: name: Style From 626d3847cd4bd20233dc088047fbfa128b450c6a Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:27:20 -0700 Subject: [PATCH 16/39] Update continuous_integration.yml fix path --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index d9a6411..bfd7977 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,7 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build RECIPE_PATH C:\conda-opensim\opensim\ + run: conda build RECIPE_PATH C:\conda-opensim\conda-opensim\opensim\ style: name: Style From 1574d1f4b7fd38a4d78f54b7ff4d4ac35cdc4c09 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:35:14 -0700 Subject: [PATCH 17/39] Update continuous_integration.yml break build into multiline --- .github/workflows/continuous_integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index bfd7977..cfa1889 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -29,7 +29,9 @@ jobs: run: conda install conda-build - name: Run build #Need numpy to use SWIG numpy typemaps. - run: conda build RECIPE_PATH C:\conda-opensim\conda-opensim\opensim\ + run: | + chdir C:\conda-opensim\conda-opensim + conda build . style: name: Style From 4175e7e7bb49d5a8837360da1bd74ab92bfb3566 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:41:31 -0700 Subject: [PATCH 18/39] Update continuous_integration.yml checkout! --- .github/workflows/continuous_integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index cfa1889..57170c6 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -16,6 +16,8 @@ jobs: runs-on: windows-latest steps: + - uses: actions/checkout@v1 + - name: Install Python packages uses: actions/setup-python@v2 with: From 1fd24114ab379f22c8e5d30b99ea025b3955fd45 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 13:44:38 -0700 Subject: [PATCH 19/39] Update continuous_integration.yml use workspace --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 57170c6..2252601 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -32,7 +32,7 @@ jobs: - name: Run build #Need numpy to use SWIG numpy typemaps. run: | - chdir C:\conda-opensim\conda-opensim + chdir $env:GITHUB_WORKSPACE conda build . style: From 4ade724002cf0a52cf995a3cf036409f2f5797b9 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 19 Apr 2021 14:56:16 -0700 Subject: [PATCH 20/39] Update continuous_integration.yml specify numpy 1.19 --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 2252601..3485f99 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -33,7 +33,7 @@ jobs: #Need numpy to use SWIG numpy typemaps. run: | chdir $env:GITHUB_WORKSPACE - conda build . + conda build . --numpy 1.19 style: name: Style From 00c414e3285d9f97bafae063b6e9f576d9e2a6df Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 21 Apr 2021 02:03:18 -0700 Subject: [PATCH 21/39] Manual install numpy --- .github/workflows/continuous_integration.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 3485f99..68a5ef8 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -22,6 +22,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: '3.7' + + - name: Install numpy + #Need numpy to use SWIG numpy typemaps. + run: python -m pip install numpy==1.19.3 - uses: conda-incubator/setup-miniconda@v2 with: @@ -33,7 +37,7 @@ jobs: #Need numpy to use SWIG numpy typemaps. run: | chdir $env:GITHUB_WORKSPACE - conda build . --numpy 1.19 + conda build . style: name: Style From a528cd2517ecba96f13fcef0ce6e641bd2689010 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 21 Apr 2021 12:03:15 -0700 Subject: [PATCH 22/39] Add Mac to script, change version number to 4-2- instead of 4.2. to avoid build script errors --- .github/workflows/continuous_integration.yml | 29 ++++++++++++++++++-- opensim/meta.yaml | 2 +- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 68a5ef8..2e839ab 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -33,12 +33,37 @@ jobs: miniconda-version: "latest" - name: Install conda-build run: conda install conda-build - - name: Run build - #Need numpy to use SWIG numpy typemaps. + + - name: Conda build run: | chdir $env:GITHUB_WORKSPACE conda build . + mac: + name: Mac + + runs-on: macos-latest + steps: + - uses: actions/checkout@v1 + + - name: Install Homebrew packages + # Save the gfortran version to a file so we can use it in the cache key. + run: | + brew install cmake pkgconfig autoconf libtool automake wget pcre doxygen + brew install --cask miniconda + pip3 install numpy==1.19.3 + + - uses: conda-incubator/setup-miniconda@v2 + with: + auto-update-conda: true + miniconda-version: "latest" + - name: Install conda-build + run: conda install conda-build + - name: Conda build + run: | + chdir $env:GITHUB_WORKSPACE + conda build . + style: name: Style diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 5a667c1..92c6818 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,6 +1,6 @@ package: name: opensim - version: "4.2.0414" + version: "4-2-0414" source: # path: /home/kidzik/workspace/opensim-core From 8c11bdddc3887b8c41c26f699573205a0d4e52c8 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 21 Apr 2021 12:57:39 -0700 Subject: [PATCH 23/39] Update meta.yaml Use 4.2 to work around package name issues --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 92c6818..013d975 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,6 +1,6 @@ package: name: opensim - version: "4-2-0414" + version: "4.2" source: # path: /home/kidzik/workspace/opensim-core From 6c0e1f5667f5738765fd2ad749931e5e52981357 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 21 Apr 2021 16:10:40 -0700 Subject: [PATCH 24/39] Update continuous_integration.yml use conda from incubator on osx --- .github/workflows/continuous_integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 2e839ab..d4107e1 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -50,7 +50,6 @@ jobs: # Save the gfortran version to a file so we can use it in the cache key. run: | brew install cmake pkgconfig autoconf libtool automake wget pcre doxygen - brew install --cask miniconda pip3 install numpy==1.19.3 - uses: conda-incubator/setup-miniconda@v2 From 81b071ce360ca3dae1ed06cb424c75815d9bad21 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 21 Apr 2021 16:50:59 -0700 Subject: [PATCH 25/39] Update continuous_integration.yml fix syntax for osx --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index d4107e1..128416c 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -60,7 +60,7 @@ jobs: run: conda install conda-build - name: Conda build run: | - chdir $env:GITHUB_WORKSPACE + cd $GITHUB_WORKSPACE conda build . style: From 8493f0c7effb598ad9a8e3f3cf79332c68a32ea9 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 21 Apr 2021 17:35:33 -0700 Subject: [PATCH 26/39] remove py>=37 that triggers bug in conda_build /windows --- opensim/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 013d975..2643b38 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -26,7 +26,6 @@ requirements: - swig - toolchain - cmake >=3.15 - - python >=3.7 - numpy >=1.19 # - python # [win] From f90ca9389674fde79c9548a563cf925cdb4199a6 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 4 Feb 2022 12:03:28 -0800 Subject: [PATCH 27/39] build on windows 4.3 codebase --- opensim/bld.bat | 5 +++-- opensim/build.sh | 3 --- opensim/meta.yaml | 10 ++++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index 8b2ebff..6979900 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -15,8 +15,9 @@ cmake ..\^ -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ -DBUILD_PYTHON_WRAPPING=ON^ -DOPENSIM_C3D_PARSER=ezc3d^ - -DOPENSIM_PYTHON_CONDA=ON^ - -DBUILD_TESTING=OFF + -DOPENSIM_PYTHON_STANDALONE=ON^ + -DBUILD_TESTING=OFF^ + -DOPENSIM_PYTHON_CONDA=ON cmake --build . --target install --config Release -- /maxcpucount:8 copy %LIBRARY_PREFIX%\simbody\bin\simbody-visualizer.exe %PREFIX%\simbody-visualizer.exe diff --git a/opensim/build.sh b/opensim/build.sh index 364df7f..d2ccdf1 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -1,7 +1,5 @@ #!/bin/bash -export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - # TODO: Dependencies should be separate packages... mkdir opensim_dependencies_build cd opensim_dependencies_build @@ -24,7 +22,6 @@ cmake ../ \ -DBUILD_PYTHON_WRAPPING=ON \ -DOPENSIM_PYTHON_CONDA=ON \ -DPYTHON_VERSION_MAJOR=3 \ - -DPYTHON_VERSION_MINOR=7 \ -DOPENSIM_C3D_PARSER=ezc3d \ -DBUILD_TESTING=OFF make -j8 diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 2643b38..bf0ff12 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,14 +1,13 @@ package: name: opensim - version: "4.2" + version: "4.3" source: -# path: /home/kidzik/workspace/opensim-core git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "dbde45530883b4755f2933a9aa1231975313dd3c" + git_rev: "c6069821831d60f7d788bd12cfa4f7cc17d31dd0" build: - number: 12 + number: 13 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - vc16 # [win and py35] @@ -20,14 +19,13 @@ requirements: run: - python - numpy - # - openblas - freeglut build: - swig - toolchain - cmake >=3.15 - numpy >=1.19 - # - python # [win] + - python >=3.8 # [win] about: home: http://opensim.stanford.edu From 5222717bcd2de0663e7b3bcccad339ecc5a01771 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 7 Feb 2022 13:27:36 -0800 Subject: [PATCH 28/39] Build without Moco libraries for now --- opensim/build.sh | 12 ++++++++++-- opensim/meta.yaml | 10 +++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/opensim/build.sh b/opensim/build.sh index d2ccdf1..6ef9576 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -6,7 +6,11 @@ cd opensim_dependencies_build cmake ../dependencies/ \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_BUILD_TYPE=Release \ - -DSUPERBUILD_ezc3d=ON + -DSUPERBUILD_ezc3d=ON \ + -DSUPERBUILD_adolc=OFF \ + -DSUPERBUILD_casadi=OFF \ + -DSUPERBUILD_colpack=OFF \ + -DSUPERBUILD_ipopt=OFF make -j8 cd .. @@ -23,6 +27,10 @@ cmake ../ \ -DOPENSIM_PYTHON_CONDA=ON \ -DPYTHON_VERSION_MAJOR=3 \ -DOPENSIM_C3D_PARSER=ezc3d \ - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF \ + -DTROPTER_WITH_SNOPT=OFF \ + -DTROPTER_WITH_OPENMP=OFF \ + -DOPENSIM_WITH_TROPTER=OFF \ + -DOPENSIM_WITH_CASADI=OFF make -j8 make install diff --git a/opensim/meta.yaml b/opensim/meta.yaml index bf0ff12..4f07e0e 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,19 +1,19 @@ package: name: opensim - version: "4.3" + version: "4.4dev.1" source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "c6069821831d60f7d788bd12cfa4f7cc17d31dd0" + git_rev: "4fb99b9d6b8e779601c45a63b3557780c432f1f8" build: number: 13 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - - vc16 # [win and py35] + - vc16 # [win and py38] # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. - detect_binary_files_with_prefix: true + # detect_binary_files_with_prefix: true requirements: run: @@ -25,7 +25,7 @@ requirements: - toolchain - cmake >=3.15 - numpy >=1.19 - - python >=3.8 # [win] + - python =3.8 # [win] about: home: http://opensim.stanford.edu From eb11157854869b79cfa0291259023c6253ce0798 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 9 Feb 2022 14:12:36 -0800 Subject: [PATCH 29/39] Add variants file for python, numpy --- opensim/conda_build_config.yaml | 9 +++++++++ opensim/meta.yaml | 26 +++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 opensim/conda_build_config.yaml diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml new file mode 100644 index 0000000..90228c3 --- /dev/null +++ b/opensim/conda_build_config.yaml @@ -0,0 +1,9 @@ +python: + - 3.7 + - 3.8 + - 3.9 +numpy: + - 1.19 + - 1.20 + - 1.21 + \ No newline at end of file diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 4f07e0e..5650a7d 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,32 +1,36 @@ package: name: opensim - version: "4.4dev.1" + version: "4.3.1" source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "4fb99b9d6b8e779601c45a63b3557780c432f1f8" + git_rev: "1b8038e166c583c1edefeb13a2ba0a1319674a9a" build: - number: 13 + number: 0 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - vc16 # [win and py38] # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. - # detect_binary_files_with_prefix: true + detect_binary_files_with_prefix: true requirements: - run: - - python - - numpy - - freeglut - build: + build: - swig - toolchain - cmake >=3.15 - - numpy >=1.19 - - python =3.8 # [win] + - numpy {{ numpy }} + - python {{ python }} + run: + - python + - numpy + - freeglut +test: + imports: + - opensim + about: home: http://opensim.stanford.edu license: Apache-2.0 From 4d9295c58dd2a60c31d20c37bb9315ee6971b2bc Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 9 Feb 2022 14:44:51 -0800 Subject: [PATCH 30/39] Use later commit hash --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 5650a7d..445600d 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -4,7 +4,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "1b8038e166c583c1edefeb13a2ba0a1319674a9a" + git_rev: "93164794c985faa496e92c8987ff394f58a69c0c" build: number: 0 From ffa434190b1980a5a4ef96c9273f7d952b6109f2 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Thu, 10 Feb 2022 00:29:37 -0800 Subject: [PATCH 31/39] Update commit hash --- opensim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 445600d..0d57d50 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -4,7 +4,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "93164794c985faa496e92c8987ff394f58a69c0c" + git_rev: "7fda7b766b9fc0920c6e099a58c63f66a31662f0" build: number: 0 From 06fbaf77ccb45bb34a4d99a2ffa9cd0a2965ac1a Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Thu, 10 Feb 2022 12:27:41 -0800 Subject: [PATCH 32/39] Disable testing for now so the package can be uploaded/tested separately --- opensim/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 0d57d50..ad77540 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -28,8 +28,8 @@ requirements: - freeglut test: - imports: - - opensim + # imports: + # - opensim about: home: http://opensim.stanford.edu From a1b80922ced4d3db37657545e52caaf018b8cb10 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 11 Feb 2022 10:03:30 -0800 Subject: [PATCH 33/39] restrict variants to 3.8 and use cond-forge recommended settings for vs 2019 --- opensim/conda_build_config.yaml | 9 ++++----- opensim/meta.yaml | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index 90228c3..f2d7ed8 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,9 +1,8 @@ python: - - 3.7 - 3.8 - - 3.9 numpy: - - 1.19 - 1.20 - - 1.21 - \ No newline at end of file +c_compiler: +- vs2019 +cxx_compiler: +- vs2019 \ No newline at end of file diff --git a/opensim/meta.yaml b/opensim/meta.yaml index ad77540..6f265bf 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -17,11 +17,15 @@ build: requirements: build: + - toolchain 2.4.0 0 + - wheel 0.36.2 pyhd3eb1b0_0 - swig - - toolchain - cmake >=3.15 - numpy {{ numpy }} - python {{ python }} + - {{ compiler('c') }} + - {{ compiler('cxx') }} + run: - python - numpy From f06549d2c39b7bed06a0ed5feb50033ebbc7732b Mon Sep 17 00:00:00 2001 From: aymanhab Date: Fri, 11 Feb 2022 10:20:06 -0800 Subject: [PATCH 34/39] Restrict vs specification to windows platform --- opensim/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index f2d7ed8..bb47dd6 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -3,6 +3,6 @@ python: numpy: - 1.20 c_compiler: -- vs2019 +- vs2019 # [win] cxx_compiler: -- vs2019 \ No newline at end of file +- vs2019 # [win] \ No newline at end of file From e4f172bed41305e16e147e1ef2384e94c89e5cae Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 14 Feb 2022 14:42:04 -0800 Subject: [PATCH 35/39] Layout install per conda recommendation with Lib, Library folders --- opensim/bld.bat | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/opensim/bld.bat b/opensim/bld.bat index 6979900..7fe50d6 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -4,6 +4,7 @@ cmake ..\dependencies^ -G"Visual Studio 16 2019"^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ -DSUPERBUILD_ezc3d=ON + cmake --build . --config Release -- /maxcpucount:8 cd .. @@ -13,10 +14,20 @@ cmake ..\^ -G"Visual Studio 16 2019"^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ + -DCMAKE_INSTALL_INCLUDEDIR="%LIBRARY_PREFIX%/Library/include"^ + -DCMAKE_INSTALL_LIBDIR="%LIBRARY_PREFIX%/Library/lib"^ + -DCMAKE_INSTALL_DOCDIR="%LIBRARY_PREFIX%/Library/doc"^ + -DCMAKE_INSTALL_SYSCONFDIR="%LIBRARY_PREFIX%/Library"^ + -DOPENSIM_INSTALL_PYTHONDIR="%LIBRARY_PREFIX%/Lib/site-packages"^ + -DOPENSIM_INSTALL_SIMBODYDIR="%LIBRARY_PREFIX%/Library/Simbody"^ + -DOPENSIM_INSTALL_SPDLOGDIR="%LIBRARY_PREFIX%/Library/spdlog"^ + -DOPENSIM_INSTALL_CASADIDIR="%LIBRARY_PREFIX%/Library"^ -DBUILD_PYTHON_WRAPPING=ON^ -DOPENSIM_C3D_PARSER=ezc3d^ -DOPENSIM_PYTHON_STANDALONE=ON^ -DBUILD_TESTING=OFF^ + -DBUILD_API_EXAMPLES=OFF^ + -DOPENSIM_BUILD_INDIVIDUAL_APPS=OFF^ -DOPENSIM_PYTHON_CONDA=ON cmake --build . --target install --config Release -- /maxcpucount:8 From a2244a5488a174131b8e84fc797489dd67d3db80 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 14 Feb 2022 14:42:47 -0800 Subject: [PATCH 36/39] Use py39 instead of 38 by default until we build variants --- opensim/conda_build_config.yaml | 2 +- opensim/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index bb47dd6..82f7ca7 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,5 +1,5 @@ python: - - 3.8 + - 3.9 numpy: - 1.20 c_compiler: diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 6f265bf..31161ea 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -10,7 +10,7 @@ build: number: 0 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - - vc16 # [win and py38] + - vc16 # [win and py39] # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. detect_binary_files_with_prefix: true From 2601b306b3a688893618a22f71f61eaeb6d5deb2 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Tue, 15 Feb 2022 11:28:43 -0800 Subject: [PATCH 37/39] Create Lib folder and run install scripts --- opensim/bld.bat | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index 7fe50d6..c83bd0b 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -31,6 +31,10 @@ cmake ..\^ -DOPENSIM_PYTHON_CONDA=ON cmake --build . --target install --config Release -- /maxcpucount:8 -copy %LIBRARY_PREFIX%\simbody\bin\simbody-visualizer.exe %PREFIX%\simbody-visualizer.exe -cd %LIBRARY_PREFIX%\sdk\python +Rem copy %LIBRARY_PREFIX%\Library\bin\simbody-visualizer.exe %LIBRARY_PREFIX%\simbody-visualizer.exe +mkdir %LIBRARY_PREFIX%\Lib +copy %LIBRARY_PREFIX%\Library\sdk\Python %LIBRARY_PREFIX%\Lib\site-packages +cd %LIBRARY_PREFIX%\Lib\site-packages +python setup_win_python38.py python setup.py install + From acf979b0a7866638439bcefe3b77c9e3107d038a Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 16 Feb 2022 12:42:25 -0800 Subject: [PATCH 38/39] no install for now, allow for variants and name package accordingly --- opensim/bld.bat | 11 ++++++----- opensim/conda_build_config.yaml | 2 ++ opensim/meta.yaml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index c83bd0b..f5623fc 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -32,9 +32,10 @@ cmake ..\^ cmake --build . --target install --config Release -- /maxcpucount:8 Rem copy %LIBRARY_PREFIX%\Library\bin\simbody-visualizer.exe %LIBRARY_PREFIX%\simbody-visualizer.exe -mkdir %LIBRARY_PREFIX%\Lib -copy %LIBRARY_PREFIX%\Library\sdk\Python %LIBRARY_PREFIX%\Lib\site-packages -cd %LIBRARY_PREFIX%\Lib\site-packages -python setup_win_python38.py -python setup.py install +echo "copying from " %LIBRARY_PREFIX%\Library\sdk\Python +echo "copy to " %LIBRARY_PREFIX%\Lib\site-packages +Rem copy %LIBRARY_PREFIX%\sdk\Python %LIBRARY_PREFIX%\..\Lib\site-packages +Rem cd %LIBRARY_PREFIX%\..\Lib\site-packages +Rem python setup_win_python38.py +Rem python setup.py install diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index 82f7ca7..a62950c 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,7 +1,9 @@ python: + - 3.8 - 3.9 numpy: - 1.20 + - 1.21 c_compiler: - vs2019 # [win] cxx_compiler: diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 31161ea..c5b1c36 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -14,7 +14,7 @@ build: # NOTE : This is needed to ensure the paths to Simbody's binaries, like # simbody-visualizer, are corrected. detect_binary_files_with_prefix: true - + string: py{{ CONDA_PY }}np{{ CONDA_NPY }} requirements: build: - toolchain 2.4.0 0 From 09ecc6517129449960d2ed1f2ec6f28c68de08e4 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Thu, 17 Feb 2022 13:45:50 -0800 Subject: [PATCH 39/39] freeglut on windows only, use hash from opensim-core master branch --- opensim/conda_build_config.yaml | 2 -- opensim/meta.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index a62950c..82f7ca7 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,9 +1,7 @@ python: - - 3.8 - 3.9 numpy: - 1.20 - - 1.21 c_compiler: - vs2019 # [win] cxx_compiler: diff --git a/opensim/meta.yaml b/opensim/meta.yaml index c5b1c36..a291e2d 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -4,7 +4,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: "7fda7b766b9fc0920c6e099a58c63f66a31662f0" + git_rev: "73530a8bf87788729be3ff371f75238a1ea50698" build: number: 0 @@ -29,7 +29,7 @@ requirements: run: - python - numpy - - freeglut + - freeglut # [win] test: # imports: