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

Remove incomplete datapar bindings to libflatarray #2552

Merged
merged 1 commit into from Mar 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 8 additions & 12 deletions CMakeLists.txt
Expand Up @@ -262,30 +262,26 @@ hpx_option(HPX_WITH_SYCL BOOL
################################################################################
# HPX datapar configuration
################################################################################
hpx_option(HPX_WITH_DATAPAR_LIBFLATARRAY BOOL
"Enable data parallel algorithm support using the external LibFlatArray (default: OFF)" OFF ADVANCED)
hpx_option(HPX_WITH_DATAPAR_VC BOOL
"Enable data parallel algorithm support using the external Vc library (default: OFF)" OFF ADVANCED)
hpx_option(HPX_WITH_DATAPAR_VC_NO_LIBRARY BOOL
"Don't link with the Vc static library (default: OFF)" OFF ADVANCED)
if(HPX_WITH_DATAPAR_VC)
hpx_option(HPX_WITH_DATAPAR_VC_NO_LIBRARY BOOL
"Don't link with the Vc static library (default: OFF)" OFF ADVANCED)
endif()
hpx_option(HPX_WITH_DATAPAR_BOOST_SIMD BOOL
"Enable data parallel algorithm support using the external Boost.SIMD library (default: OFF)" OFF ADVANCED)
if((HPX_WITH_DATAPAR_VC AND HPX_WITH_DATAPAR_BOOST_SIMD) OR
(HPX_WITH_DATAPAR_VC AND HPX_WITH_DATAPAR_BOOST_LIBFLATARRAY) OR
(HPX_WITH_DATAPAR_BOOST_SIMD AND HPX_WITH_DATAPAR_BOOST_LIBFLATARRAY))
hpx_error("Please select only one of the supported external vectorization libraries (HPX_WITH_DATAPAR_VC, HPX_WITH_DATAPAR_BOOST_SIMD, OR HPX_WITH_DATAPAR_BOOST_LIBFLATARRAY)")
endif()

if(HPX_WITH_DATAPAR_LIBFLATARRAY)
include(HPX_SetupLibFlatArray)
if(HPX_WITH_DATAPAR_VC AND HPX_WITH_DATAPAR_BOOST_SIMD)
hpx_error("Please select only one of the supported external vectorization libraries (HPX_WITH_DATAPAR_VC or HPX_WITH_DATAPAR_BOOST_SIMD)")
endif()

if(HPX_WITH_DATAPAR_VC)
include(HPX_SetupVc)
endif()
if(HPX_WITH_DATAPAR_BOOST_SIMD)
include(HPX_SetupBoostSIMD)
endif()
if((NOT HPX_WITH_DATAPAR_VC) AND (NOT HPX_WITH_DATAPAR_BOOST_SIMD) AND (NOT HPX_WITH_DATAPAR_LIBFLATARRAY))
if((NOT HPX_WITH_DATAPAR_VC) AND (NOT HPX_WITH_DATAPAR_BOOST_SIMD))
hpx_info("No vectorization library configured")
else()
set(HPX_WITH_DATAPAR ON)
Expand Down
20 changes: 0 additions & 20 deletions cmake/HPX_SetupLibFlatArray.cmake

This file was deleted.

10 changes: 7 additions & 3 deletions docs/manual/build_system/cmake_variables.qbk
Expand Up @@ -41,8 +41,9 @@ The options are split into these categories:
* [link build_system.cmake_variables.HPX_WITH_CUDA HPX_WITH_CUDA]
* [link build_system.cmake_variables.HPX_WITH_CUDA_CLANG HPX_WITH_CUDA_CLANG]
* [link build_system.cmake_variables.HPX_WITH_DATAPAR_BOOST_SIMD HPX_WITH_DATAPAR_BOOST_SIMD]
* [link build_system.cmake_variables.HPX_WITH_DATAPAR_LIBFLATARRAY HPX_WITH_DATAPAR_LIBFLATARRAY]
* [link build_system.cmake_variables.HPX_WITH_DATAPAR_VC HPX_WITH_DATAPAR_VC]
* [link build_system.cmake_variables.HPX_WITH_DATAPAR_VC_NO_LIBRARY HPX_WITH_DATAPAR_VC_NO_LIBRARY]
* [link build_system.cmake_variables.HPX_WITH_DISABLED_SIGNAL_EXCEPTION_HANDLERS HPX_WITH_DISABLED_SIGNAL_EXCEPTION_HANDLERS]
* [link build_system.cmake_variables.HPX_WITH_EXECUTION_POLICY_COMPATIBILITY HPX_WITH_EXECUTION_POLICY_COMPATIBILITY]
* [link build_system.cmake_variables.HPX_WITH_FORTRAN HPX_WITH_FORTRAN]
* [link build_system.cmake_variables.HPX_WITH_FULL_RPATH HPX_WITH_FULL_RPATH]
Expand All @@ -58,6 +59,7 @@ The options are split into these categories:
* [link build_system.cmake_variables.HPX_WITH_NATIVE_TLS HPX_WITH_NATIVE_TLS]
* [link build_system.cmake_variables.HPX_WITH_PARCEL_COALESCING HPX_WITH_PARCEL_COALESCING]
* [link build_system.cmake_variables.HPX_WITH_RUN_MAIN_EVERYWHERE HPX_WITH_RUN_MAIN_EVERYWHERE]
* [link build_system.cmake_variables.HPX_WITH_SECURITY HPX_WITH_SECURITY]
* [link build_system.cmake_variables.HPX_WITH_STATIC_LINKING HPX_WITH_STATIC_LINKING]
* [link build_system.cmake_variables.HPX_WITH_SYCL HPX_WITH_SYCL]
* [link build_system.cmake_variables.HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY]
Expand All @@ -77,11 +79,12 @@ The options are split into these categories:
[[[#build_system.cmake_variables.HPX_WITH_CUDA] `HPX_WITH_CUDA:BOOL`][Enable CUDA support (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_CUDA_CLANG] `HPX_WITH_CUDA_CLANG:BOOL`][Use clang to compile CUDA code (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_DATAPAR_BOOST_SIMD] `HPX_WITH_DATAPAR_BOOST_SIMD:BOOL`][Enable data parallel algorithm support using the external Boost.SIMD library (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_DATAPAR_LIBFLATARRAY] `HPX_WITH_DATAPAR_LIBFLATARRAY:BOOL`][Enable data parallel algorithm support using the external LibFlatArray (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_DATAPAR_VC] `HPX_WITH_DATAPAR_VC:BOOL`][Enable data parallel algorithm support using the external Vc library (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_DATAPAR_VC_NO_LIBRARY] `HPX_WITH_DATAPAR_VC_NO_LIBRARY:BOOL`][Don't link with the Vc static library (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_DISABLED_SIGNAL_EXCEPTION_HANDLERS] `HPX_WITH_DISABLED_SIGNAL_EXCEPTION_HANDLERS:BOOL`][Disables the mechanism that produces debug output for caught signals and unhandled exceptions (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_EXECUTION_POLICY_COMPATIBILITY] `HPX_WITH_EXECUTION_POLICY_COMPATIBILITY:BOOL`][Enable old execution policy names in API (default: ON)]]
[[[#build_system.cmake_variables.HPX_WITH_FORTRAN] `HPX_WITH_FORTRAN:BOOL`][Enable or disable the compilation of Fortran examples using HPX]]
[[[#build_system.cmake_variables.HPX_WITH_FULL_RPATH] `HPX_WITH_FULL_RPATH:BOOL`][Build and link HPX libraries and executables with full RPATHs (default: ON)]]
[[[#build_system.cmake_variables.HPX_WITH_FULL_RPATH] `HPX_WITH_FULL_RPATH:BOOL`][Build and link HPX libraries and executables with full RPATHs (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_GCC_VERSION_CHECK] `HPX_WITH_GCC_VERSION_CHECK:BOOL`][Don't ignore version reported by gcc (default: ON)]]
[[[#build_system.cmake_variables.HPX_WITH_GENERIC_CONTEXT_COROUTINES] `HPX_WITH_GENERIC_CONTEXT_COROUTINES:BOOL`][Use Boost.Context as the underlying coroutines context switch implementation.]]
[[[#build_system.cmake_variables.HPX_WITH_GENERIC_EXECUTION_POLICY] `HPX_WITH_GENERIC_EXECUTION_POLICY:BOOL`][Enable the generic execution policy (default: OFF)]]
Expand All @@ -94,6 +97,7 @@ The options are split into these categories:
[[[#build_system.cmake_variables.HPX_WITH_NATIVE_TLS] `HPX_WITH_NATIVE_TLS:BOOL`][Use native TLS support if available (default: ON)]]
[[[#build_system.cmake_variables.HPX_WITH_PARCEL_COALESCING] `HPX_WITH_PARCEL_COALESCING:BOOL`][Enable the parcel coalescing plugin (default: ON).]]
[[[#build_system.cmake_variables.HPX_WITH_RUN_MAIN_EVERYWHERE] `HPX_WITH_RUN_MAIN_EVERYWHERE:BOOL`][Run hpx_main by default on all localities (default: OFF).]]
[[[#build_system.cmake_variables.HPX_WITH_SECURITY] `HPX_WITH_SECURITY:BOOL`][Enable security support via libsodium.]]
[[[#build_system.cmake_variables.HPX_WITH_STATIC_LINKING] `HPX_WITH_STATIC_LINKING:BOOL`][Compile HPX statically linked libraries (Default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_SYCL] `HPX_WITH_SYCL:BOOL`][Enable sycl support (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY] `HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY:BOOL`][Enable old overloads for transform_reduce and inner_product (default: ON)]]
Expand Down
27 changes: 0 additions & 27 deletions hpx/parallel/traits/detail/libflatarray/fake_accessor.hpp

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.