File tree Expand file tree Collapse file tree
tests/unit_tests/device/cuda
tutorials/src/device/cuda
utils/include/detray/detectors Expand file tree Collapse file tree Original file line number Diff line number Diff line change 7373 # Set the path to the test data files
7474 env :
7575 DETRAY_DATA_DIRECTORY : ${{ github.workspace }}/data/
76- DETRAY_BFIELD_FILE : ${{ github.workspace }}/data/odd-bfield_v0_8_0 .cvf
76+ DETRAY_BFIELD_FILE : ${{ github.workspace }}/data/odd-bfield_v0_9_0 .cvf
7777
7878 # The build/test steps to execute.
7979 steps :
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ build_cuda:
2828test_cuda :
2929 variables :
3030 DETRAY_DATA_DIRECTORY : src/data/
31- DETRAY_BFIELD_FILE : $CI_PROJECT_DIR/src/data/odd-bfield_v0_8_0 .cvf
31+ DETRAY_BFIELD_FILE : $CI_PROJECT_DIR/src/data/odd-bfield_v0_9_0 .cvf
3232 stage : test
3333 tags : [docker-gpu-nvidia]
3434 image : ghcr.io/acts-project/ubuntu2004_cuda:v30
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ usage() {
2727}
2828
2929# Default script arguments.
30- DETRAY_DATA_NAME=${DETRAY_DATA_NAME:- " detray-data-v1 " }
30+ DETRAY_DATA_NAME=${DETRAY_DATA_NAME:- " detray-data-v2 " }
3131DETRAY_WEB_DIRECTORY=${DETRAY_WEB_DIRECTORY:- " https://acts.web.cern.ch/traccc/data" }
3232DETRAY_DATA_DIRECTORY=${DETRAY_DATA_DIRECTORY:- $(cd $(dirname " ${BASH_SOURCE[0]} " ) && pwd)}
3333DETRAY_CMAKE_EXECUTABLE=${DETRAY_CMAKE_EXECUTABLE:- cmake}
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ message( STATUS "Fetching covfie as part of the Detray project" )
1818
1919# Declare where to get covfie from.
2020set ( DETRAY_COVFIE_SOURCE
21- "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.8.1 .tar.gz;URL_MD5;0b4dc9624533d1ed4ea7a763da47f07e "
21+ "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.9.0 .tar.gz;URL_MD5;b310712c6dd1acc8104c734086f40fc0 "
2222 CACHE STRING "Source for covfie, when built as part of this project" )
2323mark_as_advanced ( DETRAY_COVFIE_SOURCE )
2424FetchContent_Declare ( covfie ${DETRAY_COVFIE_SOURCE} )
Original file line number Diff line number Diff line change @@ -24,10 +24,10 @@ namespace detray {
2424namespace bfield ::cuda {
2525
2626// Inhomogeneous field (cuda)
27- using inhom_bknd_t = covfie::backend::affine<
28- covfie::backend::nearest_neighbour <covfie::backend::strided<
29- covfie::vector::ulong3, covfie::backend::cuda_device_array<
30- covfie::vector::vector_d<scalar, 3 >>>>>;
27+ using inhom_bknd_t = covfie::backend::affine<covfie::backend::linear<
28+ covfie::backend::strided <covfie::vector::vector_d<std:: size_t , 3 >,
29+ covfie::backend::cuda_device_array<
30+ covfie::vector::vector_d<scalar, 3 >>>>>;
3131
3232} // namespace bfield::cuda
3333
Original file line number Diff line number Diff line change @@ -31,9 +31,9 @@ namespace detray::tutorial {
3131namespace bfield ::cuda {
3232
3333// Inhomogeneous field (cuda)
34- using inhom_bknd_t = covfie::backend::affine<
35- covfie::backend::nearest_neighbour <covfie::backend::strided<
36- covfie::vector::ulong3 ,
34+ using inhom_bknd_t =
35+ covfie::backend::affine<covfie::backend::linear <covfie::backend::strided<
36+ covfie::vector::vector_d<std:: size_t , 3 > ,
3737 covfie::backend::cuda_device_array<
3838 covfie::vector::vector_d<detray::scalar, 3 >>>>>;
3939
Original file line number Diff line number Diff line change 1414// Covfie include(s)
1515#include < covfie/core/backend/primitive/constant.hpp>
1616#include < covfie/core/backend/transformer/affine.hpp>
17+ #include < covfie/core/backend/transformer/linear.hpp>
1718#include < covfie/core/backend/transformer/nearest_neighbour.hpp>
1819#include < covfie/core/backend/transformer/strided.hpp>
1920#include < covfie/core/field.hpp>
21+ #include < covfie/core/vector.hpp>
2022
2123namespace detray ::bfield {
2224
@@ -28,7 +30,13 @@ using const_bknd_t =
2830using const_field_t = covfie::field<const_bknd_t >;
2931
3032// / Inhomogeneous field (host)
31- using inhom_bknd_t = covfie::backend::affine<
33+ using inhom_bknd_t =
34+ covfie::backend::affine<covfie::backend::linear<covfie::backend::strided<
35+ covfie::vector::vector_d<std::size_t , 3 >,
36+ covfie::backend::array<covfie::vector::vector_d<detray::scalar, 3 >>>>>;
37+
38+ // / Inhomogeneous field with nearest neighbor (host)
39+ using inhom_bknd_nn_t = covfie::backend::affine<
3240 covfie::backend::nearest_neighbour<covfie::backend::strided<
3341 covfie::vector::ulong3,
3442 covfie::backend::array<covfie::vector::vector_d<detray::scalar, 3 >>>>>;
You can’t perform that action at this time.
0 commit comments