Integration branch SixTrackLib 0.7.0

CMakeLists.txt

@@ -9,7 +9,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization or
 # submit itself to any jurisdiction.
 
-cmake_minimum_required( VERSION 3.8 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.11 FATAL_ERROR )
 project( sixtracklib LANGUAGES C CXX )
 
 message( STATUS "---- Project sixtracklib" )

Settings.cmake.default

@@ -131,10 +131,18 @@ if( SIXTRACKL_ENABLE_OPENCL )
     set( SIXTRACKL_TARGET_OPENCL_VERSION "120" CACHE STRING
         "Target OpenCL 1.x version" )
 
-    option( SIXTRACKL_USE_LEGACY_CL_HPP "Use legacy cl.hpp header" OFF )
+    option( SIXTRACKL_USE_LEGACY_CL_HPP
+            "Use legacy cl.hpp header [DEPRECATED!]" OFF )
+
+    option( SIXTRACKL_OPENCL_ALWAYS_DOWNLOAD_HEADERS
+            "Always try to download latest stable OpenCL headers" OFF )
 
     option( SIXTRACKL_OPENCL_CXX_ENABLE_EXCEPTIONS
             "Enable OpenCL 1.x Host-side C++ Exceptions" ON )
+
+    set( SIXTRACKL_OPENCL_PRINT_BUILD_REPORT "error" CACHE STRING
+         "print OpenCL build report [values: always, error, never]" )
+
 endif()
 
 # ------------------------------------------------------------------------------

examples/c99/CMakeLists.txt

@@ -107,16 +107,13 @@ set( ALL_EXAMPLE_TARGETS
      ${EXAMPLE_TARGETS} ${EXAMPLE_OPENCL_TARGETS} ${EXAMPLE_CUDA_TARGETS} )
 
 if( ALL_EXAMPLE_TARGETS )
-    set(  EXAMPLE_COMPILE_OPTIONS ${SIXTRACKLIB_CPU_FLAGS} )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -Wall )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -Werror )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -pedantic )
-
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY LINKER_LANGUAGE C )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY C_STANDARD 99 )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY C_STANDARD_REQUIRED ON )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS}
-                  APPEND PROPERTY COMPILE_OPTIONS ${EXAMPLE_COMPILE_OPTIONS} )
+                  APPEND PROPERTY COMPILE_OPTIONS
+                  ${SIXTRACKLIB_CPU_FLAGS} ${SIXTRACKLIB_C99_FLAGS}
+                  ${SIXTRACKL_C99_AUTOVEC_FLAGS} )
 
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY
                   LINK_LIBRARIES ${EXAMPLE_LINK_LIBRARIES} )

examples/c99/simple_particles_buffer.c

@@ -91,7 +91,8 @@ int main( int argc, char* argv[] )
                     )st_Object_get_const_begin_ptr( cmp_obj_it );
 
                 printf( "particle blocks: %3lu / %3lu\r\n",
-                        ii, num_particles_blocks );
+                        ( unsigned long )ii,
+                        ( unsigned long )num_particles_blocks );
 
                 printf( " -> original particles object : \r\n" );
                 printParticles( cmp_particles );
@@ -148,7 +149,8 @@ int main( int argc, char* argv[] )
                     )st_Object_get_const_begin_ptr( obj_it );
 
                 printf( "managed buffer particle blocks: %3lu / %3lu\r\n",
-                        ii, num_particles_blocks );
+                        ( unsigned long )ii,
+                        ( unsigned long )num_particles_blocks );
 
                 printf( " -> copy particles object : \r\n" );
                 printParticles( particles );

examples/c99/track_bbsimple.c

@@ -70,7 +70,8 @@ int main( int argc, char* argv[] )
     }
 
     printf( "Use: NUM_PARTICLES = %10lu\r\n"
-            "     NUM_TURNS     = %10lu\r\n\r\n", NUM_PARTICLES, NUM_TURNS );
+            "     NUM_TURNS     = %10lu\r\n\r\n",
+            ( unsigned long )NUM_PARTICLES, ( unsigned long )NUM_TURNS );
 
     /* ********************************************************************** */
     /* ****   Building Particles Data from Input Example Particle Data   **** */

examples/c99/track_beambeam.c

@@ -70,7 +70,8 @@ int main( int argc, char* argv[] )
     }
 
     printf( "Use: NUM_PARTICLES = %10lu\r\n"
-            "     NUM_TURNS     = %10lu\r\n\r\n", NUM_PARTICLES, NUM_TURNS );
+            "     NUM_TURNS     = %10lu\r\n\r\n",
+            ( unsigned long )NUM_PARTICLES, ( unsigned long )NUM_TURNS );
 
     /* ********************************************************************** */
     /* ****   Building Particles Data from Input Example Particle Data   **** */

examples/c99/track_lhc_bb.c

@@ -72,7 +72,7 @@ int main( int argc, char* argv[] )
 
     printf( "Selected NUM_PARTICLES = %10lu\r\n"
             "Selected NUM_TURNS     = %10lu\r\n"
-            "\r\n", NUM_PARTICLES, NUM_TURNS );
+            "\r\n", ( unsigned long )NUM_PARTICLES, ( unsigned long )NUM_TURNS );
 
     /* ********************************************************************** */
     /* ****   Building Particles Data from LHC Particle Dump Data        **** */

examples/c99/track_lhc_no_bb.c

@@ -72,7 +72,7 @@ int main( int argc, char* argv[] )
 
     printf( "Selected NUM_PARTICLES = %10lu\r\n"
             "Selected NUM_TURNS     = %10lu\r\n"
-            "\r\n", NUM_PARTICLES, NUM_TURNS );
+            "\r\n", ( unsigned long )NUM_PARTICLES, ( unsigned long )NUM_TURNS );
 
     /* ********************************************************************** */
     /* ****   Building Particles Data from LHC Particle Dump Data        **** */

examples/cxx/CMakeLists.txt

@@ -45,7 +45,18 @@ if( SIXTRACKL_ENABLE_OPENCL )
     add_executable( track_lhc_no_bb_opencl_cxx track_lhc_no_bb_opencl.cpp )
     list( APPEND EXAMPLE_OPENCL_TARGETS track_lhc_no_bb_opencl_cxx )
 
+    # -------------------------------------------------------------------------
+    # track_fodo_opencl_cxx:
+    add_executable( track_fodo_opencl_cxx track_fodo_opencl.cpp )
+    list( APPEND EXAMPLE_OPENCL_TARGETS track_fodo_opencl_cxx )
+
+endif()
 
+if( SIXTRACKL_ENABLE_CUDA )
+    # -------------------------------------------------------------------------
+    # track_fodo_opencl_cxx:
+    add_executable( track_fodo_cuda_cxx track_fodo_cuda.cpp )
+    list( APPEND EXAMPLE_CUDA_TARGETS track_fodo_cuda_cxx )
 endif()
 
 # ==============================================================================
@@ -55,17 +66,12 @@ set( ALL_EXAMPLE_TARGETS
      ${EXAMPLE_TARGETS} ${EXAMPLE_OPENCL_TARGETS} ${EXAMPLE_CUDA_TARGETS} )
 
 if( ALL_EXAMPLE_TARGETS )
-
-    set(  EXAMPLE_COMPILE_OPTIONS ${SIXTRACKLIB_CPU_FLAGS} )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -Wall )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -Werror )
-    list( APPEND EXAMPLE_COMPILE_OPTIONS -pedantic )
-
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY LINKER_LANGUAGE CXX )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY CXX_STANDARD 11 )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS} PROPERTY CXX_STANDARD_REQUIRED ON )
     set_property( TARGET ${ALL_EXAMPLE_TARGETS}
-                  APPEND PROPERTY COMPILE_OPTIONS ${EXAMPLE_COMPILE_OPTIONS} )
+                  APPEND PROPERTY COMPILE_OPTIONS ${SIXTRACKLIB_CPU_FLAGS}
+                  ${SIXTRACKLIB_CXX_FLAGS} ${SIXTRACKL_CXX_AUTOVEC_FLAGS} )
 
     set_property( TARGET ${ALL_EXAMPLE_TARGETS}
                   PROPERTY LINK_LIBRARIES ${EXAMPLE_LINK_LIBRARIES} )
@@ -186,5 +192,3 @@ if( SIXTRACKL_INSTALL_EXAMPLES AND ALL_EXAMPLE_TARGETS )
         configure_file( \"${CMAKELISTS_TXT_IN_PATH}\"
                         \"${CMAKELISTS_TXT_INSTALL_PATH}\" ESCAPE_QUOTES @ONLY )" )
 endif()
-
-# end: examples/cxx/CMakeLists.txt

examples/cxx/track_fodo_cuda.cpp

@@ -0,0 +1,74 @@
+#include <cmath>
+#include <chrono>
+#include <iostream>
+#include <numeric>
+#include <string>
+
+#include "sixtracklib/testlib.h"
+#include "sixtracklib/sixtracklib.hpp"
+
+int main( int const argc, char* argv[] )
+{
+    namespace st = sixtrack;
+    using std::sqrt;
+    using track_job_type = st::CudaTrackJob;
+
+    unsigned int NUM_PARTICLES = 50000; // Default
+    unsigned int NUM_TURNS = 10000; // Default
+    std::string const device_id = "0.0";
+
+    double const Q0 = 1.0;
+    double const MASS0 = ( double )SIXTRL_PHYS_CONST_MASS_PROTON_EV;
+    double const P0_C = 450.0e9;
+    double const MIN_X = 0.0;
+    double const MAX_X = 1e-8;
+    double const CHI   = 1.0;
+    double const CHARGE_RATIO = 1.0;
+
+    if( argc == 1 )
+    {
+        std::cout << "Usage: " << argv[ 0 ]
+                  << " num_particles=" << NUM_PARTICLES
+                  << " num_turns=" << NUM_TURNS << std::endl;
+    }
+
+    if( argc >= 2 )
+    {
+        NUM_PARTICLES = std::stoi( argv[ 1 ] );
+
+        if( argc >= 3 )
+        {
+            NUM_TURNS = std::stoi( argv[ 2 ] );
+        }
+    }
+
+    /* ---------------------------------------------------------------------- */
+    /* Build lattice */
+
+    st::Buffer lattice;
+    ::NS(TrackTestdata_generate_fodo_lattice)( lattice.getCApiPtr(), NUM_TURNS );
+
+    /* ---------------------------------------------------------------------- */
+    /* Init particle distribution */
+
+    st::Buffer pbuffer;
+    ::NS(TrackTestdata_generate_particle_distr_x)( pbuffer.getCApiPtr(),
+        NUM_PARTICLES, P0_C, MIN_X, MAX_X, MASS0, Q0, CHI, CHARGE_RATIO );
+
+    /* ---------------------------------------------------------------------- */
+    /* Create Track Job */
+
+    track_job_type job( device_id, pbuffer, lattice );
+    auto start_time = std::chrono::steady_clock::now();
+    job.trackUntil( NUM_TURNS );
+    st::collect( job );
+    auto stop_time = std::chrono::steady_clock::now();
+
+    std::chrono::duration< double > const wtime = stop_time - start_time;
+
+    std::cout << "elapsed wall time: " << wtime.count() << " sec\r\n"
+              << "                 = " << wtime.count() / ( NUM_PARTICLES * NUM_TURNS )
+              << " sec/particles/turn" << std::endl;
+
+    return 0;
+}

examples/cxx/track_fodo_opencl.cpp

@@ -0,0 +1,80 @@
+#include <cmath>
+#include <chrono>
+#include <iostream>
+#include <numeric>
+#include <string>
+
+#include "sixtracklib/testlib.h"
+#include "sixtracklib/sixtracklib.hpp"
+
+int main( int const argc, char* argv[] )
+{
+    namespace st = sixtrack;
+    using std::sqrt;
+    using track_job_type = st::TrackJobCl;
+
+    unsigned int NUM_PARTICLES = 50000; // Default
+    unsigned int NUM_TURNS = 10000; // Default
+    std::string device_id = "0:0";
+
+    double const Q0 = 1.0;
+    double const MASS0 = ( double )SIXTRL_PHYS_CONST_MASS_PROTON_EV;
+    double const P0_C = 450.0e9;
+    double const MIN_X = 0.0;
+    double const MAX_X = 1e-8;
+    double const CHI   = 1.0;
+    double const CHARGE_RATIO = 1.0;
+
+    if( argc == 1 )
+    {
+        std::cout << "Usage: " << argv[ 0 ]
+                  << "device_id=" << device_id
+                  << " num_particles=" << NUM_PARTICLES
+                  << " num_turns=" << NUM_TURNS << std::endl;
+    }
+
+    if( argc >= 2 )
+    {
+        device_id = std::string{ argv[ 1 ] };
+
+        if( argc >= 3 )
+        {
+            NUM_PARTICLES = std::stoi( argv[ 2 ] );
+
+            if( argc >= 4 )
+            {
+                NUM_TURNS = std::stoi( argv[ 3 ] );
+            }
+        }
+    }
+
+    /* ---------------------------------------------------------------------- */
+    /* Build lattice */
+
+    st::Buffer lattice;
+    ::NS(TrackTestdata_generate_fodo_lattice)( lattice.getCApiPtr(), NUM_TURNS );
+
+    /* ---------------------------------------------------------------------- */
+    /* Init particle distribution */
+
+    st::Buffer pbuffer;
+    ::NS(TrackTestdata_generate_particle_distr_x)( pbuffer.getCApiPtr(),
+        NUM_PARTICLES, P0_C, MIN_X, MAX_X, MASS0, Q0, CHI, CHARGE_RATIO );
+
+    /* ---------------------------------------------------------------------- */
+    /* Create Track Job */
+
+    track_job_type job( device_id, pbuffer, lattice );
+    auto start_time = std::chrono::steady_clock::now();
+    job.track( NUM_TURNS );
+    st::collect( job );
+    auto stop_time = std::chrono::steady_clock::now();
+
+    std::chrono::duration< double > const wtime = stop_time - start_time;
+
+    std::cout << "elapsed wall time: " << wtime.count() << " sec\r\n"
+              << "                 = " << wtime.count() / ( NUM_PARTICLES * NUM_TURNS )
+              << " sec/particles/turn" << std::endl;
+
+    return 0;
+}