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

Archive the Futhark and Kokkos code #652

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ jobs:
cxx_standard: "17"
options: -DTRACCC_BUILD_SYCL=TRUE
run_tests: true
- name: KOKKOS
container: ghcr.io/acts-project/ubuntu2004:v30
cxx_standard: "17"
options: -DTRACCC_BUILD_KOKKOS=TRUE
run_tests: false
- name: ALPAKA
container: ghcr.io/acts-project/ubuntu2204:v33
cxx_standard: "17"
Expand Down
25 changes: 0 additions & 25 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ option( TRACCC_BUILD_CUDA "Build the CUDA sources included in traccc"
${TRACCC_BUILD_CUDA_DEFAULT} )
option( TRACCC_BUILD_HIP "Build the HIP sources included in traccc" FALSE)
option( TRACCC_BUILD_SYCL "Build the SYCL sources included in traccc" FALSE )
option( TRACCC_BUILD_FUTHARK "Build the Futhark sources included in traccc"
FALSE )
option( TRACCC_BUILD_KOKKOS "Build the Kokkos sources included in traccc"
FALSE )
option( TRACCC_BUILD_ALPAKA "Build the Alpaka sources included in traccc"
FALSE )
option( TRACCC_BUILD_IO "Build the IO module (needed by examples, performance, testing)" TRUE )
Expand Down Expand Up @@ -157,20 +153,6 @@ if( TRACCC_SETUP_TBB )
endif()
endif()

# Set up Kokkos.
option( TRACCC_SETUP_KOKKOS
"Set up the Kokkos library" ${TRACCC_BUILD_KOKKOS} )
option( TRACCC_USE_SYSTEM_KOKKOS
"Pick up an existing installation of Kokkos from the build environment"
${TRACCC_USE_SYSTEM_LIBS} )
if( TRACCC_SETUP_KOKKOS )
if( TRACCC_USE_SYSTEM_KOKKOS )
find_package( Kokkos REQUIRED )
else()
add_subdirectory( extern/kokkos )
endif()
endif()

# Set up Alpaka.
option( TRACCC_SETUP_ALPAKA
"Set up the Alpaka library" ${TRACCC_BUILD_ALPAKA})
Expand Down Expand Up @@ -291,9 +273,6 @@ add_subdirectory( device/common )
if( TRACCC_BUILD_CUDA )
add_subdirectory( device/cuda )
endif()
if( TRACCC_BUILD_KOKKOS )
add_subdirectory( device/kokkos )
endif()
if( TRACCC_BUILD_SYCL )
add_subdirectory( device/sycl )
endif()
Expand Down Expand Up @@ -327,9 +306,5 @@ if( BUILD_TESTING AND TRACCC_BUILD_TESTING )
add_subdirectory( tests )
endif()

if(TRACCC_BUILD_FUTHARK)
add_subdirectory(device/futhark)
endif()

# Set up the packaging of the project.
include( traccc-packaging )
8 changes: 0 additions & 8 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
"TRACCC_BUILD_ALPAKA" : "TRUE"
}
},
{
"name" : "kokkos",
"displayName" : "Kokkos Code Development",
"inherits": ["cuda"],
"cacheVariables": {
"TRACCC_BUILD_KOKKOS" : "TRUE"
}
},
{
"name" : "root",
"displayName" : "ROOT Enabled Code Development",
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ Demonstrator tracking chain for accelerators.

## Features

| Category | Algorithms | CPU | CUDA | SYCL | Alpaka | Kokkos | Futhark |
| ------------------ | ---------------------- | --- | ---- | ---- | ------ | ------ | ------- |
| **Clusterization** | CCL / FastSv / etc. | ✅ | ✅ | ✅ | 🟡 | ⚪ | ✅ |
| | Measurement creation | ✅ | ✅ | ✅ | 🟡 | ⚪ | ✅ |
| **Seeding** | Spacepoint formation | ✅ | ✅ | ✅ | 🟡 | ⚪ | ⚪ |
| | Spacepoint binning | ✅ | ✅ | ✅ | ✅ | ✅ | ⚪ |
| | Seed finding | ✅ | ✅ | ✅ | ✅ | ⚪ | ⚪ |
| | Track param estimation | ✅ | ✅ | ✅ | ✅ | ⚪ | ⚪ |
| **Track finding** | Combinatorial KF | ✅ | ✅ | 🟡 | 🟡 | ⚪ | ⚪ |
| **Track fitting** | KF | ✅ | ✅ | ✅ | ⚪ | ⚪ | ⚪ |
| **Ambiguity resolution** | Greedy resolver | ✅ | ⚪ | ⚪ | ⚪ | ⚪ | ⚪ |
| Category | Algorithms | CPU | CUDA | SYCL | Alpaka |
| ------------------ | ---------------------- | --- | ---- | ---- | ------ |
| **Clusterization** | CCL / FastSv / etc. | ✅ | ✅ | ✅ | 🟡 |
| | Measurement creation | ✅ | ✅ | ✅ | 🟡 |
| **Seeding** | Spacepoint formation | ✅ | ✅ | ✅ | 🟡 |
| | Spacepoint binning | ✅ | ✅ | ✅ | ✅ |
| | Seed finding | ✅ | ✅ | ✅ | ✅ |
| | Track param estimation | ✅ | ✅ | ✅ | ✅ |
| **Track finding** | Combinatorial KF | ✅ | ✅ | 🟡 | 🟡 |
| **Track fitting** | KF | ✅ | ✅ | ✅ | ⚪ |
| **Ambiguity resolution** | Greedy resolver | ✅ | ⚪ | ⚪ | ⚪ |

✅: exists, 🟡: work started, ⚪: work not started yet

The relations between datatypes and algorithms is given in the (approximately
commutative) diagram shown below. Black lines indicate CPU algorithms, green
lines indicate CUDA algorithms, blue lines indicate SYCL algorithms, and brown
lines indicate Futhark algorithms. Solid algorithms are ready for use, dashed
algorithms are in development or future goals. Data types for different
heterogeneous platforms are contracted for legibility, and identities are
hidden.
lines indicate Futhark algorithms (these are deprecated). Solid algorithms are
ready for use, dashed algorithms are in development or future goals. Data types
for different heterogeneous platforms are contracted for legibility, and
identities are hidden.

```mermaid
flowchart LR
Expand Down
8 changes: 0 additions & 8 deletions cmake/traccc-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
set( TRACCC_BUILD_CUDA @TRACCC_BUILD_CUDA@ )
set( TRACCC_BUILD_HIP @TRACCC_BUILD_HIP@ )
set( TRACCC_BUILD_SYCL @TRACCC_BUILD_SYCL@ )
set( TRACCC_BUILD_FUTHARK @TRACCC_BUILD_FUTHARK@ )
set( TRACCC_BUILD_KOKKOS @TRACCC_BUILD_KOKKOS@ )
set( TRACCC_BUILD_ALPAKA @TRACCC_BUILD_ALPAKA@ )
set( TRACCC_BUILD_EXAMPLES @TRACCC_BUILD_EXAMPLES@ )
set( TRACCC_USE_ROOT @TRACCC_USE_ROOT@ )
Expand All @@ -31,15 +29,9 @@ include( CMakeFindDependencyMacro )
find_dependency( Eigen3 )
find_dependency( Thrust )
find_dependency( dfelibs )
if( TRACCC_BUILD_KOKKOS )
find_dependency( Kokkos )
endif()
if( TRACCC_BUILD_ALPAKA )
find_dependency( alpaka )
endif()
if( TRACCC_BUILD_FUTHARK )
find_dependency( Futhark )
endif()
find_dependency( Acts )
find_dependency( vecmem )
find_dependency( algebra-plugins )
Expand Down
4 changes: 0 additions & 4 deletions cmake/traccc-packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,5 @@ install( FILES
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/traccc-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" )

# Install the "language helper" file(s).
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindFuthark.cmake"
DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" )

# Clean up.
unset( CMAKE_INSTALL_CMAKEDIR )
4 changes: 0 additions & 4 deletions examples/run/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ if (TRACCC_BUILD_SYCL)
add_subdirectory(sycl)
endif()

if (TRACCC_BUILD_KOKKOS)
add_subdirectory(kokkos)
endif()

if (TRACCC_BUILD_ALPAKA)
add_subdirectory(alpaka)
endif()
Expand Down
2 changes: 2 additions & 0 deletions extras/archive/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This directory contains old code which is worth keeping but which isn't
actively being developed.
File renamed without changes.
File renamed without changes.
8 changes: 0 additions & 8 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ if( TRACCC_BUILD_SYCL )
add_subdirectory( sycl )
endif()

if( TRACCC_BUILD_KOKKOS )
add_subdirectory( kokkos )
endif()

if( TRACCC_BUILD_ALPAKA )
add_subdirectory( alpaka )
endif()

if(TRACCC_BUILD_FUTHARK)
add_subdirectory(futhark)
endif()
Loading