diff --git a/CMakeLists.txt b/CMakeLists.txt index da7d39d..ea6811f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,6 @@ add_executable(${XTENSOR_BENCHMARK_TARGET} ${XTENSOR_BENCHMARK} ${XTENSOR_HEADER # Mandatory dependencies # ====================== - find_package(xtensor REQUIRED CONFIG) find_package(xsimd REQUIRED) find_package(xtl REQUIRED) @@ -135,8 +134,8 @@ endif() if(BENCHMARK_PYTHONIC) find_package(PythonLibs) - find_package(NumPy) - find_package(Pythran) + find_package(Numpy) + find_package(Pythran ) link_directories(${Pythran_INCLUDE_DIRS}) target_compile_definitions(${XTENSOR_BENCHMARK_TARGET} PRIVATE HAS_PYTHONIC=1 ENABLE_PYTHON_MODULE=1 USE_BOOST_SIMD=1) target_include_directories(${XTENSOR_BENCHMARK_TARGET} PRIVATE diff --git a/environment.yml b/environment.yml index 7905fbe..e7a39a9 100644 --- a/environment.yml +++ b/environment.yml @@ -3,14 +3,15 @@ channels: - conda-forge - defaults dependencies: - - eigen + - conda-forge::benchmark + - conda-forge::libblitz + - conda-forge::pythran + - eigen>=3.0 - armadillo - xsimd - xtensor - xtl - - cmake + - cmake>=3.1 - gmp - numpy - - python - - pip: - - pythran + - python>=3.0