From ad3b33389d95238bb30988564178e0abe55cf82a Mon Sep 17 00:00:00 2001 From: aymanhab Date: Tue, 29 Oct 2024 11:44:49 -0700 Subject: [PATCH] Remove unnecessary opensim-moco folder build latest master into 4.5.99 --- .travis.yml | 27 -------------- README.md | 4 +-- opensim-moco/bld.bat | 41 --------------------- opensim-moco/build.sh | 53 ---------------------------- opensim-moco/conda_build_config.yaml | 19 ---------- opensim-moco/meta.yaml | 53 ---------------------------- opensim/bld.bat | 10 +++--- opensim/conda_build_config.yaml | 1 - opensim/meta.yaml | 3 +- 9 files changed, 9 insertions(+), 202 deletions(-) delete mode 100644 .travis.yml delete mode 100644 opensim-moco/bld.bat delete mode 100644 opensim-moco/build.sh delete mode 100644 opensim-moco/conda_build_config.yaml delete mode 100644 opensim-moco/meta.yaml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2f6bd73..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: python -python: - # We don't actually use the Travis Python, but this keeps it organized. - - "3.7" -install: - - sudo apt-get update - # We do this conditionally because it saves us some downloading if the - # version is the same. - - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; - else - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - fi - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - # Useful for debugging any issues with conda - - conda info -a - - # Replace dep1 dep2 ... with your dependencies - - conda install conda-build - - conda-build opensim - -script: - # Your test script goes here diff --git a/README.md b/README.md index f8e3d9b..7ad030c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # conda-opensim -Conda recipe for OpenSim 4.4 +Conda recipe for opensim packages Usage: @@ -7,4 +7,4 @@ Usage: conda build opensim Only python 3 is supported. Default settings/package doesn't include Moco -Packages with Moco are in a separate opensim-with-moco packages +Packages come with Moco and have version number ending in .99 for dev builds diff --git a/opensim-moco/bld.bat b/opensim-moco/bld.bat deleted file mode 100644 index 90e0433..0000000 --- a/opensim-moco/bld.bat +++ /dev/null @@ -1,41 +0,0 @@ -mkdir opensim_dependencies_build -cd .\opensim_dependencies_build -cmake ..\dependencies^ - -G"Visual Studio 17 2022"^ - -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ - -DSUPERBUILD_ezc3d=ON^ - -DOPENSIM_WITH_TROPTER=ON^ - -DOPENSIM_WITH_CASADI=ON - -cmake --build . --config Release -- /maxcpucount:8 -cd .. -mkdir opensim_build -cd .\opensim_build -cmake ..\^ - -G"Visual Studio 17 2022"^ - -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ - -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ - -DCMAKE_INSTALL_INCLUDEDIR="%LIBRARY_PREFIX%/include"^ - -DCMAKE_INSTALL_LIBDIR="%LIBRARY_PREFIX%/lib"^ - -DCMAKE_INSTALL_DOCDIR="%LIBRARY_PREFIX%/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^ - -DOPENSIM_WITH_CASADI=ON^ - -DOPENSIM_WITH_TROPTER=ON^ - -DBUILD_TESTING=OFF^ - -DBUILD_API_EXAMPLES=OFF^ - -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^ - -DOPENSIM_PYTHON_CONDA=ON -cmake --build . --target install --config Release -- /maxcpucount:8 - -Rem move Library\sdk\Python Lib -move %LIBRARY_PREFIX%\sdk\Python %LIBRARY_PREFIX%\..\Lib -cd %LIBRARY_PREFIX%\..\Lib -python setup.py install - diff --git a/opensim-moco/build.sh b/opensim-moco/build.sh deleted file mode 100644 index 50d9b43..0000000 --- a/opensim-moco/build.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# TODO: Dependencies should be separate packages... -mkdir opensim_dependencies_build -cd opensim_dependencies_build -cmake ../dependencies/ -LAH \ - -DCMAKE_INSTALL_PREFIX="$PREFIX" \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ - -DSUPERBUILD_docopt=ON \ - -DSUPERBUILD_simbody=ON \ - -DSUPERBUILD_spdlog=ON \ - -DSUPERBUILD_ezc3d=ON \ - -DOPENSIM_WITH_TROPTER=ON \ - -DOPENSIM_WITH_CASADI=ON - -make -j8 -cd .. - -# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ - -if [ "$(uname)" == "Darwin" ]; then - SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.1.1 -else - SWIG_DIR_SPEC=/home/runner/swig/ -fi -# TODO: Tests are missing! -mkdir opensim_build -cd opensim_build -cmake ../ \ - -DCMAKE_INSTALL_PREFIX="$PREFIX" \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENSIM_DEPENDENCIES_DIR="$PREFIX" \ - -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ - -DSWIG_DIR=${SWIG_DIR_SPEC} \ - -DSWIG_EXECUTABLE=/home/runner/swig/bin/swig \ - -DBUILD_PYTHON_WRAPPING=ON \ - -DOPENSIM_DISABLE_LOG_FILE=ON \ - -DOPENSIM_C3D_PARSER=ezc3d \ - -DOPENSIM_PYTHON_STANDALONE=ON \ - -DOPENSIM_INSTALL_UNIX_FHS=ON \ - -DBUILD_API_ONLY=OFF \ - -DBUILD_API_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ - -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON \ - -DOPENSIM_COPY_DEPENDENCIES=ON \ - -DOPENSIM_WITH_TROPTER=ON \ - -DOPENSIM_WITH_CASADI=ON -make -j8 -make install diff --git a/opensim-moco/conda_build_config.yaml b/opensim-moco/conda_build_config.yaml deleted file mode 100644 index ae7f3b4..0000000 --- a/opensim-moco/conda_build_config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: '10.10' -python: - - 3.10 -numpy: - - 1.25.* -zip_keys: - - python - - numpy -c_compiler: - - vs2019 # [win] - - clang # [osx] - - gcc # [linux] -cxx_compiler: - - vs2019 # [win] - - clangxx # [osx] - - gxx # [linux] -fortran_compiler: - - gfortran # [linux] - diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml deleted file mode 100644 index 332f9b5..0000000 --- a/opensim-moco/meta.yaml +++ /dev/null @@ -1,53 +0,0 @@ -{% set version = "4.5.1" %} - -package: - name: opensim-moco - version: {{ version }} - -source: - git_url: https://github.com/opensim-org/opensim-core.git - git_rev: main -build: - number: 1 - # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets - features: - - 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 - string: py{{ CONDA_PY }}np{{ CONDA_NPY }} -requirements: - host: - - openblas # [not win] - build: - - toolchain 2.4.0 0 # [win] - #- wheel 0.36.2 pyhd3eb1b0_0 - # - swig 4.1.1 - - {{ compiler("cxx") }} - - {{ compiler('fortran') }} - - cmake - - numpy {{ numpy }} - - python {{ python }} - - openblas # [not win] - - make # [not win] - - run: - - numpy {{ numpy }} - - python {{ python }} - - freeglut # [win] - - openblas # [not win] - -test: - imports: - - opensim - -about: - home: http://opensim.stanford.edu - license: Apache-2.0 - summary: > - OpenSim is software that lets users develop models of musculoskeletal - structures and create dynamic simulations of movement. - -extra: - recipe-maintainers: - - aymanhab diff --git a/opensim/bld.bat b/opensim/bld.bat index b543604..49a21cb 100644 --- a/opensim/bld.bat +++ b/opensim/bld.bat @@ -4,8 +4,8 @@ cmake ..\dependencies^ -G"Visual Studio 17 2022"^ -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,12 +26,14 @@ cmake ..\^ -DBUILD_PYTHON_WRAPPING=ON^ -DOPENSIM_C3D_PARSER=ezc3d^ -DOPENSIM_PYTHON_STANDALONE=ON^ - -DOPENSIM_WITH_CASADI=OFF^ + -DOPENSIM_WITH_CASADI=ON^ -DOPENSIM_WITH_TROPTER=OFF^ -DBUILD_TESTING=OFF^ -DBUILD_API_EXAMPLES=OFF^ -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^ - -DOPENSIM_PYTHON_CONDA=ON + -DOPENSIM_PYTHON_CONDA=ON^ + -DSWIG_EXECUTABLE="D:/dev/tools/swigwin-4.1.1/swig.exe" + cmake --build . --target install --config Release -- /maxcpucount:8 Rem move Library\sdk\Python Lib diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index 0f176d3..41c656a 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,7 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: '12' python: - 3.10 - numpy: - 1.25 diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 818376c..1f27d19 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.5.1" %} +{% set version = "4.5.99" %} package: name: opensim @@ -50,4 +50,3 @@ about: extra: recipe-maintainers: - aymanhab - - kidzik