-
-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create new version 3.6.1 #23
Changes from 35 commits
719cf8f
c33399d
f97d6b9
a94e3b5
3d76a3f
6e4de8d
c26c30d
84cbf0c
6423667
2de6b04
9cca3a3
4c1e75b
adf1dca
e29bbdb
a9d200b
6806418
63f25c4
9c6a8bf
ef055ae
a7c9027
2901139
b28280e
b289c81
4fd802a
ceaf41d
2f1ff02
7de86b6
d49f566
372800c
311553a
4d53fec
0eb1e9f
714d2b6
a51e64b
954d565
a6ad101
51eb0b3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,24 @@ | ||
build_number_decrement: | ||
- '0' | ||
c_compiler: | ||
- toolchain_c | ||
- gcc | ||
channel_sources: | ||
- conda-forge/label/gcc7,defaults | ||
channel_targets: | ||
- conda-forge gcc7 | ||
cxx_compiler: | ||
- toolchain_cxx | ||
- gxx | ||
docker_image: | ||
- condaforge/linux-anvil-comp7 | ||
openblas: | ||
- 0.2.20 | ||
- 0.3.3 | ||
pin_run_as_build: | ||
openblas: | ||
max_pin: x.x.x | ||
zip_keys: | ||
- - c_compiler | ||
- cxx_compiler | ||
- channel_sources | ||
- channel_targets | ||
- docker_image | ||
- build_number_decrement |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,27 @@ | ||
MACOSX_DEPLOYMENT_TARGET: | ||
- '10.9' | ||
build_number_decrement: | ||
- '0' | ||
c_compiler: | ||
- toolchain_c | ||
- clang | ||
channel_sources: | ||
- conda-forge/label/gcc7,defaults | ||
channel_targets: | ||
- conda-forge gcc7 | ||
cxx_compiler: | ||
- toolchain_cxx | ||
- clangxx | ||
macos_machine: | ||
- x86_64-apple-darwin13.4.0 | ||
macos_min_version: | ||
- '10.9' | ||
openblas: | ||
- 0.2.20 | ||
- 0.3.3 | ||
pin_run_as_build: | ||
openblas: | ||
max_pin: x.x.x | ||
zip_keys: | ||
- - c_compiler | ||
- cxx_compiler | ||
- channel_sources | ||
- channel_targets | ||
- build_number_decrement |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/bin/bash | ||
|
||
curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ | ||
curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ | ||
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
travis: | ||
secure: | ||
BINSTAR_TOKEN: I+L4bYUiz09ojMmKlRth2u9kOsScZLGdVLE5pGRLh5mesyuztpTQ44WiDJbIj5VnBLv0/9xvUekIJz0Ok1dQ+QAVHKrUizPAglIQLWG1jX/eytbyK+RZCYIdqbOSxRrdkLuaLyGmP8ARUw8xywSRCzRGGDFfs31dPtsrXGDSYxrqkzVU8EiehkC93aupIyoJWTGRAQ4PA88AhdWTGdfBkIfmx0sNuBbH1FzKi3qpXc21ThjnT6O7JU7Nezq2yEW5GO1WD0sXgY414QALyKHl/Gf7mLO1fOd4EcLHxdDTC+BiQmCBJZpK8u8JYO12zTV0QrI6AAvvY0pE4bpbdHFlmO9oQ/NnVE9qCPLybh6FC0AH8nnTBlzDVna1shWjzf2zvvATZSrLQ3A4Aez61B5//Ps7c33U2/O3IrDl/VXW5VXPagNfrI5zHTG7I6zt20BRNmQmPwlT6Lt7h+wCorlR21sqqf1zUaMdP9xPEhT0JwreuY/jz9hzok7S0lGzMzhaMgD6F7o5QXtsRp9LQ26FUAVG4HVSQs4SABiC9LAoDyIFj3+BZurHQ1FFaBz58AGVgnzkkRONggAqlCMGi1O5lMB5vu86uTOnKGpXBcBcwMHplCWRN74MokhSZ2CYlaWqQn405xy/HPNfu97e9OFZObuJo4l1HQpXd6GjFE8wIqM= | ||
compiler_stack: comp7 | ||
appveyor: | ||
secure: | ||
BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,9 @@ | ||
#!/bin/bash | ||
|
||
# FIXME: This is a hack to make sure the environment is activated. | ||
# The reason this is required is due to the conda-build issue | ||
# mentioned below. | ||
# | ||
# https://github.com/conda/conda-build/issues/910 | ||
source activate "${CONDA_DEFAULT_ENV}" | ||
|
||
mkdir build | ||
cd build | ||
|
||
declare -a CMAKE_PLATFORM_FLAGS | ||
if [[ "$OSTYPE" == "linux-gnu" ]]; then | ||
# TODO: This test is failing for a yet-to-be-determined reason. See | ||
# https://github.com/simbody/simbody/issues/400 for more details. Once | ||
|
@@ -17,16 +12,23 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then | |
# The CMAKE_CXX_FLAGS is required due to this bug in Simbody: | ||
# https://github.com/simbody/simbody/issues/511 | ||
GLUT_OVERRIDE=(-DCMAKE_CXX_FLAGS="-I$PREFIX/include") | ||
CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake") | ||
# TODO: Temporary, because setting up OpenGL is challenging. | ||
CMAKE_PLATFORM_FLAGS+=(-DBUILD_VISUALIZER=off) | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
SKIP_TEST=() | ||
GLUT_OVERRIDE=() | ||
fi | ||
|
||
# https://github.com/AnacondaRecipes/freeglut-feedstock/blob/master/recipe/build.sh | ||
|
||
cmake .. \ | ||
-DCMAKE_INSTALL_PREFIX="$PREFIX" \ | ||
-DCMAKE_INSTALL_LIBDIR="lib" \ | ||
-DCMAKE_BUILD_TYPE="RELEASE" \ | ||
${CMAKE_PLATFORM_FLAGS[@]} \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Match indentation? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Addressed. |
||
-DBUILD_USING_OTHER_LAPACK="$PREFIX/lib/libopenblas${SHLIB_EXT}" $GLUT_OVERRIDE | ||
make | ||
make --jobs ${CPU_COUNT} | ||
# NOTE: Run the tests here in the build directory to make sure things are built | ||
# correctly. This cannot be specified in the meta.yml:test section because it | ||
# won't be run in the build directory. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# MACOSX_DEPLOYMENT_TARGET: | ||
# - 10.10 | ||
# macos_min_version: | ||
# - 10.10 | ||
c_compiler: | ||
- gcc # [linux] | ||
- clang # [osx] | ||
cxx_compiler: | ||
- gxx # [linux] | ||
- clangxx # [osx] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# https://github.com/ContinuumIO/anaconda-issues/issues/8779 | ||
# https://github.com/AnacondaRecipes/freeglut-feedstock/blob/master/recipe/cross-linux.cmake | ||
# this one is important | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These notes could be a bit more informative. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Addressed. |
||
set(CMAKE_SYSTEM_NAME Linux) | ||
set(CMAKE_PLATFORM Linux) | ||
|
||
# specify the cross compiler | ||
set(CMAKE_C_COMPILER $ENV{CC}) | ||
set(CMAKE_CXX_COMPILER $ENV{CXX}) | ||
|
||
# where is the target environment | ||
set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot) | ||
|
||
# search for programs in the build host directories | ||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) | ||
# for libraries and headers in the target directories | ||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) | ||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe a note about why this is linked here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed.