Skip to content
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

Update to 19.10, fix lapack patch, fix numpy deps #17

Merged
merged 5 commits into from
Apr 10, 2018

Conversation

aldanor
Copy link
Contributor

@aldanor aldanor commented Apr 8, 2018

  • Update dlib to v19.10
  • Fix numpy deps as recommended here
  • Fix out-of-date patch files

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@aldanor aldanor mentioned this pull request Apr 8, 2018
@aldanor
Copy link
Contributor Author

aldanor commented Apr 8, 2018

@conda-forge-admin, please rerender

@aldanor
Copy link
Contributor Author

aldanor commented Apr 8, 2018

Well that's just weird, the patch works for me locally (on OS X):

$ conda build recipe
...
Applying patch: 'dlib-feedstock/recipe/lapack_sgetrf.patch'
patching file dlib/cmake_utils/find_blas.cmake
...

Edit: fixed (whitespace issues).

@aldanor
Copy link
Contributor Author

aldanor commented Apr 8, 2018

Ok, the Linux builds are green, waiting on win/osx.

@aldanor
Copy link
Contributor Author

aldanor commented Apr 8, 2018

Something's off with target_compile_features on OS X:

CMake Error at /Users/travis/miniconda3/conda-bld/dlib_1523209255322/work/dlib-19.10/dlib/cmake_utils/use_cpp_11.cmake:74 (target_compile_features):
  target_compile_features The compiler feature "cxx_thread_local" is not
  known to CXX compiler
  "Clang"
  version 6.1.0.6020053.

It must be this commit: davisking/dlib@3b2d73d

Ok, apparently it's a known thing so it can be patched for now.

@aldanor
Copy link
Contributor Author

aldanor commented Apr 8, 2018

@jschueller, @patricksnape - the build is green, could this get merged please?

Thanks!

@patricksnape patricksnape merged commit 387b875 into conda-forge:master Apr 10, 2018
@patricksnape
Copy link
Contributor

Thanks @aldanor !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants