From ab210ef1ff8af3d48d89f44d0e6dec4341593b81 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Tue, 14 Jun 2022 12:16:06 -0700 Subject: [PATCH 1/4] turn moco build on --- opensim/bld.bat | 8 ++++---- opensim/build.sh | 8 ++++---- opensim/meta.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opensim/bld.bat b/opensim/bld.bat index 47795ad..56ee279 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -4,8 +4,8 @@ cmake ..\dependencies^ -G"Visual Studio 16 2019"^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ -DSUPERBUILD_ezc3d=ON^ - -DOPENSIM_WITH_TROPTER=OFF^ - -DOPENSIM_WITH_CASADI=OFF + -DOPENSIM_WITH_TROPTER=ON^ + -DOPENSIM_WITH_CASADI=ON cmake --build . --config Release -- /maxcpucount:8 cd .. @@ -26,8 +26,8 @@ cmake ..\^ -DBUILD_PYTHON_WRAPPING=ON^ -DOPENSIM_C3D_PARSER=ezc3d^ -DOPENSIM_PYTHON_STANDALONE=ON^ - -DOPENSIM_WITH_CASADI=OFF^ - -DOPENSIM_WITH_TROPTER=OFF^ + -DOPENSIM_WITH_CASADI=ON^ + -DOPENSIM_WITH_TROPTER=ON^ -DBUILD_TESTING=OFF^ -DBUILD_API_EXAMPLES=OFF^ -DOPENSIM_BUILD_INDIVIDUAL_APPS=OFF^ diff --git a/opensim/build.sh b/opensim/build.sh index ebd4c9f..2bdc03c 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -12,8 +12,8 @@ cmake ../dependencies/ -LAH \ -DSUPERBUILD_simbody=ON \ -DSUPERBUILD_spdlog=ON \ -DSUPERBUILD_ezc3d=ON \ - -DOPENSIM_WITH_TROPTER=OFF \ - -DOPENSIM_WITH_CASADI=OFF + -DOPENSIM_WITH_TROPTER=ON \ + -DOPENSIM_WITH_CASADI=ON make -j8 cd .. @@ -46,7 +46,7 @@ cmake ../ \ -DBUILD_API_ONLY=ON \ -DOPENSIM_BUILD_INDIVIDUAL_APPS_DEFAULT=OFF \ -DOPENSIM_COPY_DEPENDENCIES=ON \ - -DOPENSIM_WITH_TROPTER=OFF \ - -DOPENSIM_WITH_CASADI=OFF + -DOPENSIM_WITH_TROPTER=ON \ + -DOPENSIM_WITH_CASADI=ON make -j8 make install diff --git a/opensim/meta.yaml b/opensim/meta.yaml index ea0bad9..0606c96 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,7 +1,7 @@ {% set version = "4.4" %} package: - name: opensim + name: opensim-moco version: {{ version }} source: From 2e58516ed027fbdb46273975a50148838e666cbd Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Tue, 14 Jun 2022 19:14:16 -0700 Subject: [PATCH 2/4] update artifact names --- .github/workflows/continuous_integration.yml | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index cb5de14..b9f63f2 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -40,8 +40,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py37np120.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py37np120.tar.bz2 + name: win64-opensim-moco-4.4-py37np120.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py37np120.tar.bz2 windows38: runs-on: windows-2019 @@ -72,8 +72,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py38np120.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py38np120.tar.bz2 + name: win64-opensim-moco-4.4-py38np120.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py38np120.tar.bz2 windows39: runs-on: windows-2019 @@ -104,8 +104,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py39np120.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py39np120.tar.bz2 + name: win64-opensim-moco-4.4-py39np120.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py39np120.tar.bz2 mac: name: Mac @@ -170,8 +170,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py37np120.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py37np120.tar.bz2 + name: linux64-opensim-moco-4.4-py37np120.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py37np120.tar.bz2 ubuntu38: runs-on: ubuntu-18.04 @@ -198,14 +198,14 @@ jobs: - name: Conda build run: | - cd $GITHUB_WORKSPACE/opensim + cd $GITHUB_WORKSPACE/opensim-moco conda build . - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py38np120.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py38np120.tar.bz2 + name: linux64-opensim-moco-4.4-py38np120.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py38np120.tar.bz2 ubuntu39: runs-on: ubuntu-18.04 @@ -238,8 +238,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py39np120.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py39np120.tar.bz2 + name: linux64-opensim-moco-4.4-py39np120.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py39np120.tar.bz2 style: name: Style From 227f1ebdb8cd8b1c36064157746264d88fec1702 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Tue, 21 Jun 2022 13:28:11 -0700 Subject: [PATCH 3/4] enable Moco build into package opensim-moco --- .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 b9f63f2..2ac80ab 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -198,7 +198,7 @@ jobs: - name: Conda build run: | - cd $GITHUB_WORKSPACE/opensim-moco + cd $GITHUB_WORKSPACE/opensim conda build . - name: upload artifact From 88c899e69cef3373701e10dad1757939b0e3a8bb Mon Sep 17 00:00:00 2001 From: Alberto Casas Ortiz Date: Sat, 25 Jun 2022 06:55:21 +0200 Subject: [PATCH 4/4] Copy dependencies of dependencies to lib. --- opensim/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opensim/build.sh b/opensim/build.sh index 2bdc03c..5fbea53 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -18,6 +18,12 @@ cmake ../dependencies/ -LAH \ make -j8 cd .. + +# Copy dependencies of dependencies to lib +cp $PREFIX/ipopt/lib/libipopt.so $PREFIX/ipopt/lib/libipopt.so.1 $PREFIX/ipopt/lib/libipopt.so.1.10.8 $PREFIX/ipopt/lib/libcoinmetis.so.1.3.5 $PREFIX/ipopt/lib/libcoinmetis.so.1 $PREFIX/ipopt/lib/libcoinmetis.so $PREFIX/ipopt/lib/libcoinmumps.so.1.6.0 $PREFIX/ipopt/lib/libcoinmumps.so.1 $PREFIX/ipopt/lib/libcoinmumps.so $PREFIX/lib +cp $PREFIX/colpack/lib/libColPack.so $PREFIX/colpack/lib/libColPack.so.0 $PREFIX/lib + + # cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ if [ "$(uname)" == "Darwin" ]; then