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.

Sign up for GitHub

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

Jump to bottom

make json tests optional, bump xtl/xsimd versions #871

Merged
merged 2 commits into from May 22, 2018
Merged

make json tests optional, bump xtl/xsimd versions #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c57547b
make json tests optional, bump xtl/xsimd versions
wolfv May 22, 2018
c126bbc
bump versions on travis
wolfv May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ install:
- conda update -q conda
- conda info -a
- conda install gtest cmake -c conda-forge
- conda install xtl==0.4.8 -c QuantStack
- conda install xtl==0.4.9 -c QuantStack
- conda install xsimd -c QuantStack
- conda install nlohmann_json -c QuantStack
# - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON -DXTENSOR_USE_XSIMD=ON -DDISABLE_VS2017=ON .
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda install gtest cmake -c conda-forge
- conda install xtl==0.4.8 -c QuantStack
- conda install xtl==0.4.9 -c QuantStack
- conda install xsimd -c QuantStack
- conda install nlohmann_json -c QuantStack
# Testing
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ message(STATUS "Building xtensor v${${PROJECT_NAME}_VERSION}")
# Dependencies
# ============

find_package(xtl 0.4.1 REQUIRED)
find_package(xtl 0.4.9 REQUIRED)

message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")

Expand Down Expand Up @@ -122,7 +122,7 @@ endif()

if(XTENSOR_USE_XSIMD)
add_definitions(-DXTENSOR_USE_XSIMD)
find_package(xsimd 4 REQUIRED)
find_package(xsimd 4.1.3 REQUIRED)
message(STATUS "Found xsimd: ${xsimd_INCLUDE_DIRS}/xsimd")
target_link_libraries(xtensor INTERFACE xsimd)
endif()
Expand Down
5 changes: 4 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -106,7 +106,6 @@ set(XTENSOR_TESTS
test_xinfo.cpp
test_xiterator.cpp
test_xio.cpp
test_xjson.cpp
test_xlayout.cpp
test_xmath.cpp
test_xnan_functions.cpp
Expand Down Expand Up @@ -135,6 +134,10 @@ set(XTENSOR_TESTS
test_xutils.cpp
)

if(nlohmann_json_FOUND)
list(APPEND XTENSOR_TESTS test_xjson.cpp)
endif()

# remove xinfo tests for compilers < GCC 5
if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5))
list(REMOVE_ITEM XTENSOR_TESTS test_xinfo.cpp)
Expand Down