Merge pull request #129 from ComputationalRadiationPhysics/release-1.5.2

release 1.5.2

Author: PrometheusPi

CHANGELOG.md

@@ -0,0 +1,91 @@
+# Changelog
+
+## [v1.5.2] - 2021-01-22
+
+alpaka 0.6.0 is required if you enabled alpaka support.
+
+* Server
+  - fix jansson 2.12+ support #123
+* Library
+  - fix missing include #124
+  - fix jansson 2.12+ support #123
+  - apply namespace refactoring from alpaka 0.6.0rc3 #122
+
+
+## [v1.5.1] - 2020-11-06
+
+* Server
+  - Send/Receive buffer sizes adjustable in cmake as ISAAC_MAX_RECEIVE + added warnings/errors on overflow #115
+  - Fix for newer LibWebSocket versions #108
+  - Replaced imageConnectorList with map to guarantee correct ID #106
+
+* Library
+  - enable AO bug via pre-compiler flag #112
+  - Fix for wrong depth values on clipping plane for ambient occlusion calculations #111
+  - Use correct MIN/MAX functions in kernel #109
+  - fix compile error (missing include) #107
+
+
+## [v1.5.0] - 2020-05-04
+
+The versioning of the server follows now the library versioning.
+
+- CMake: remove manipulation of CUDA_NVCC_FLAGS #101
+- Add Simple ambient occlusion effect #98
+- Modern browser fix and client code reorganization #92
+- Alpaka example fix + Updated Alpaka function calls #89
+- Particle integration in library and example #88
+- Server fixes #87
+
+
+## [v1.4.0] - 2018-06-12
+
+- Fixed broken iso surface calculation for border regions
+- Fixed visible egdes between node borders in iso surface rendering
+- Fixed memory access of gradient calculation in two-cell border around volume
+- Added simple ortho projection functionality
+- Fixed installed config path
+
+
+## [v1.3.3] - 2017-11-03
+
+- removed broken and useless(?) include of a header file not available anymore in boost version 1.65.0 and above
+
+
+## [v1.3.2] - 2017-11-03
+
+- set needed libwebsockets version to 2.1.1 or above as 2.10 is buggy
+- fixed broken CUDACC_VER of CUDA 9
+- fixed build for building without CUDA
+- added a define ISAAC_IDX_TYPE for changing the index type when using Alpaka
+- removed isaac_uint_dim as it was not used and made problems
+- renamed the internal variable threadIdx as the nvcc may confuse it with it's own
+- fixed some GCC 7.1 warnings
+- using boolean definitions from libjpeg headers
+- fixed ISAAC_HOST_DEVICE_INLINE macro
+- added manual control buttons to the examples
+
+
+## [v1.3.1] - 2017-07-06
+
+- Fixed version macros
+
+
+## [v1.3.0] - 2017-04-06
+
+- Fixed ISAAC CMake Config and installation
+- Fixed bug in server, which prevented more than one connection in some cases
+
+
+## [v1.2.0] - 2017-01-05
+
+- Adding protocol string (major and minor)
+- Splitted server and library version (both major, minor and patch)
+- Splitted server and library CMake files
+- Some little bug fixing
+
+
+## [v1.1.0] - 2016-11-10
+
+
+## [v1.0.0] - 2016-05-26

INSTALL.md

@@ -94,10 +94,10 @@ be built yourself nevertheless or the distribution versions are outdated.
 The ISAACConfig.cmake searches for these requirements. See
 `example/CMakeLists.txt` for an easy to adopt example.
 
-* __Alpaka__ for the abstraction of the acceleration device. If only CUDA
+* __alpaka__ (version 0.6.0) for the abstraction of the acceleration device. If only CUDA
   is used, this library is __not needed__:
   * _From Source_:
-    * `git clone https://github.com/ComputationalRadiationPhysics/alpaka.git`
+    * `git clone https://github.com/alpaka-group/alpaka.git`
     * It is a header only library and doesn't need to be installed. However
       the root directory of the libary has to be added to the CMake variable
       `CMAKE_MODULE_PATH`, e.g. with

example/example.cpp

@@ -372,55 +372,55 @@ int main(
 #if ISAAC_ALPAKA == 1
 
     // Alpaka specific initialization
-    using AccDim = alpaka::dim::DimInt< 3 >;
-    using SimDim = alpaka::dim::DimInt< 3 >;
-    using DatDim = alpaka::dim::DimInt< 1 >;
+    using AccDim = alpaka::DimInt< 3 >;
+    using SimDim = alpaka::DimInt< 3 >;
+    using DatDim = alpaka::DimInt< 1 >;
 
-    //using Acc = alpaka::acc::AccGpuCudaRt<AccDim, ISAAC_IDX_TYPE>;
-    //using Stream  = alpaka::queue::QueueCudaRtSync;
+    //using Acc = alpaka::AccGpuCudaRt<AccDim, ISAAC_IDX_TYPE>;
+    //using Stream  = alpaka::QueueCudaRtSync;
 
-    using Acc = alpaka::acc::AccCpuOmp2Blocks<
+    using Acc = alpaka::AccCpuOmp2Blocks<
         AccDim,
         ISAAC_IDX_TYPE
     >;
-    using Stream  = alpaka::queue::QueueCpuSync;
+    using Stream  = alpaka::QueueCpuSync;
 
-    //using Acc = alpaka::acc::AccCpuOmp2Threads<AccDim, ISAAC_IDX_TYPE>;
-    //using Stream  = alpaka::queue::QueueCpuSync;
+    //using Acc = alpaka::AccCpuOmp2Threads<AccDim, ISAAC_IDX_TYPE>;
+    //using Stream  = alpaka::QueueCpuSync;
 
-    using DevAcc = alpaka::dev::Dev< Acc >;
-    using DevHost = alpaka::dev::DevCpu;
-    using PltfHost = alpaka::pltf::Pltf< DevHost >;
-    using PltfAcc = alpaka::pltf::Pltf< DevAcc >;
+    using DevAcc = alpaka::Dev< Acc >;
+    using DevHost = alpaka::DevCpu;
+    using PltfHost = alpaka::Pltf< DevHost >;
+    using PltfAcc = alpaka::Pltf< DevAcc >;
 
     DevAcc devAcc(
-        alpaka::pltf::getDevByIdx< PltfAcc >(
-            rank % alpaka::pltf::getDevCount< PltfAcc >( )
+        alpaka::getDevByIdx< PltfAcc >(
+            rank % alpaka::getDevCount< PltfAcc >( )
         )
     );
-    DevHost devHost( alpaka::pltf::getDevByIdx< PltfHost >( 0u ) );
+    DevHost devHost( alpaka::getDevByIdx< PltfHost >( 0u ) );
     Stream stream( devAcc );
 
-    const alpaka::vec::Vec< SimDim, ISAAC_IDX_TYPE > global_size(
+    const alpaka::Vec< SimDim, ISAAC_IDX_TYPE > global_size(
         d[0] * VOLUME_X,
         d[1] * VOLUME_Y,
         d[2] * VOLUME_Z
     );
-    const alpaka::vec::Vec< SimDim, ISAAC_IDX_TYPE > local_size(
+    const alpaka::Vec< SimDim, ISAAC_IDX_TYPE > local_size(
         ISAAC_IDX_TYPE( VOLUME_X ),
         ISAAC_IDX_TYPE( VOLUME_Y ),
         ISAAC_IDX_TYPE( VOLUME_Z )
     );
-    const alpaka::vec::Vec< DatDim, ISAAC_IDX_TYPE > data_size(
+    const alpaka::Vec< DatDim, ISAAC_IDX_TYPE > data_size(
         ISAAC_IDX_TYPE( VOLUME_X ) * ISAAC_IDX_TYPE( VOLUME_Y )
         * ISAAC_IDX_TYPE( VOLUME_Z )
     );
-    const alpaka::vec::Vec< SimDim, ISAAC_IDX_TYPE > position(
+    const alpaka::Vec< SimDim, ISAAC_IDX_TYPE > position(
         p[0] * VOLUME_X,
         p[1] * VOLUME_Y,
         p[2] * VOLUME_Z
     );
-    const alpaka::vec::Vec< alpaka::dim::DimInt< 1 >, ISAAC_IDX_TYPE > particle_count(
+    const alpaka::Vec< alpaka::DimInt< 1 >, ISAAC_IDX_TYPE > particle_count(
         ISAAC_IDX_TYPE( PARTICLE_COUNT )
     );
 
@@ -454,43 +454,43 @@ int main(
     // Init memory
 #if ISAAC_ALPAKA == 1
 
-    alpaka::mem::buf::Buf< DevHost, float3_t, DatDim, ISAAC_IDX_TYPE >
+    alpaka::Buf< DevHost, float3_t, DatDim, ISAAC_IDX_TYPE >
         hostBuffer1(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float3_t,
             ISAAC_IDX_TYPE
         >(
             devHost,
             data_size
         )
     );
-    alpaka::mem::buf::Buf< DevAcc, float3_t, DatDim, ISAAC_IDX_TYPE >
+    alpaka::Buf< DevAcc, float3_t, DatDim, ISAAC_IDX_TYPE >
         deviceBuffer1(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float3_t,
             ISAAC_IDX_TYPE
         >(
             devAcc,
             data_size
         )
     );
-    alpaka::mem::buf::Buf<
+    alpaka::Buf<
         DevHost, float, DatDim,
         ISAAC_IDX_TYPE
     > hostBuffer2(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float,
             ISAAC_IDX_TYPE
         >(
             devHost,
             data_size
         )
     );
-    alpaka::mem::buf::Buf<
+    alpaka::Buf<
         DevAcc, float, DatDim,
         ISAAC_IDX_TYPE
     > deviceBuffer2(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float,
             ISAAC_IDX_TYPE
         >(
@@ -499,19 +499,19 @@ int main(
         )
     );
 
-    alpaka::mem::buf::Buf< DevHost, float3_t, DatDim, ISAAC_IDX_TYPE >
+    alpaka::Buf< DevHost, float3_t, DatDim, ISAAC_IDX_TYPE >
         hostBuffer3(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float3_t,
             ISAAC_IDX_TYPE
         >(
             devHost,
             particle_count
         )
     );
-    alpaka::mem::buf::Buf< DevAcc, float3_t, DatDim, ISAAC_IDX_TYPE >
+    alpaka::Buf< DevAcc, float3_t, DatDim, ISAAC_IDX_TYPE >
         deviceBuffer3(
-        alpaka::mem::buf::alloc<
+        alpaka::allocBuf<
             float3_t,
             ISAAC_IDX_TYPE
         >(
@@ -551,7 +551,7 @@ int main(
         devAcc,
         devHost,
         stream,
-        reinterpret_cast<isaac_float3 *> ( alpaka::mem::view::getPtrNative( deviceBuffer1 ) )
+        reinterpret_cast<isaac_float3 *> ( alpaka::getPtrNative( deviceBuffer1 ) )
     );
     TestSource2<
         DevAcc,
@@ -561,7 +561,7 @@ int main(
         devAcc,
         devHost,
         stream,
-        reinterpret_cast<isaac_float *> ( alpaka::mem::view::getPtrNative( deviceBuffer2 ) )
+        reinterpret_cast<isaac_float *> ( alpaka::getPtrNative( deviceBuffer2 ) )
     );
 
     ParticleSource1<
@@ -572,7 +572,7 @@ int main(
         devAcc,
         devHost,
         stream,
-        reinterpret_cast<isaac_float3 *> ( alpaka::mem::view::getPtrNative( deviceBuffer3 ) ),
+        reinterpret_cast<isaac_float3 *> ( alpaka::getPtrNative( deviceBuffer3 ) ),
         PARTICLE_COUNT
     );
 
@@ -685,7 +685,7 @@ int main(
         SimDim, //Dimension of the Simulation. In this case: 3D
         ParticleList, SourceList, //The boost::fusion list of Source Types
 #if ISAAC_ALPAKA == 1
-        alpaka::vec::Vec<
+        alpaka::Vec<
             SimDim,
             ISAAC_IDX_TYPE
         >, //Type of the 3D vectors used later

example/example_details.hpp

@@ -37,20 +37,20 @@ void update_particles(
     for( ISAAC_IDX_TYPE i = 0; i < particle_count[0]; i++ )
     {
 #if ISAAC_ALPAKA == 1
-        alpaka::mem::view::getPtrNative( hostBuffer3 )[i][0] =
+        alpaka::getPtrNative( hostBuffer3 )[i][0] =
             float( ( int( i * 29.6f ) ) % 64 ) / 64.0f;
-        alpaka::mem::view::getPtrNative( hostBuffer3 )[i][1] =
+        alpaka::getPtrNative( hostBuffer3 )[i][1] =
             float( ( int( i * 23.1f ) ) % 64 ) / 64.0f;
-        alpaka::mem::view::getPtrNative( hostBuffer3 )[i][2] = float(
+        alpaka::getPtrNative( hostBuffer3 )[i][2] = float(
             ( int( ( i * 7.9f + pos * ( i % 20 + 1 ) ) * 1000 ) ) % 64000
         ) / 1000.0f / 64.0f;
     }
     /*
-    const alpaka::vec::Vec <alpaka::dim::DimInt< 1 >, ISAAC_IDX_TYPE>
+    const alpaka::Vec <alpaka::DimInt< 1 >, ISAAC_IDX_TYPE>
         data_size( ISAAC_IDX_TYPE( particle_count )
     );
      */
-    alpaka::mem::view::copy(
+    alpaka::memcpy(
         stream,
         deviceBuffer3,
         hostBuffer3,
@@ -137,30 +137,30 @@ void update_data(
                 size_t pos =
                     x + y * local_size[0] + z * local_size[0] * local_size[1];
 #if ISAAC_ALPAKA == 1
-                alpaka::mem::view::getPtrNative( hostBuffer1 )[pos][0] =
+                alpaka::getPtrNative( hostBuffer1 )[pos][0] =
                     intensity;
-                alpaka::mem::view::getPtrNative( hostBuffer1 )[pos][1] =
+                alpaka::getPtrNative( hostBuffer1 )[pos][1] =
                     intensity;
-                alpaka::mem::view::getPtrNative( hostBuffer1 )[pos][2] =
+                alpaka::getPtrNative( hostBuffer1 )[pos][2] =
                     intensity;
-                alpaka::mem::view::getPtrNative( hostBuffer2 )[pos] =
+                alpaka::getPtrNative( hostBuffer2 )[pos] =
                     ( 2.0f - l ) * ( 2.0f - l ) / 4.0f;
             }
         }
     }
-    const alpaka::vec::Vec <alpaka::dim::DimInt< 1 >, ISAAC_IDX_TYPE>
+    const alpaka::Vec <alpaka::DimInt< 1 >, ISAAC_IDX_TYPE>
         data_size(
         ISAAC_IDX_TYPE( local_size[0] )
         * ISAAC_IDX_TYPE( local_size[1] )
         * ISAAC_IDX_TYPE( local_size[2] )
     );
-    alpaka::mem::view::copy(
+    alpaka::memcpy(
         stream,
         deviceBuffer1,
         hostBuffer1,
         data_size
     );
-    alpaka::mem::view::copy(
+    alpaka::memcpy(
         stream,
         deviceBuffer2,
         hostBuffer2,
@@ -463,7 +463,7 @@ void read_vtk_to_memory(
                 size_t pos = t_x + t_y * local_size[0]
                              + t_z * local_size[0] * local_size[1];
 #if ISAAC_ALPAKA == 1
-                alpaka::mem::view::getPtrNative( hostBuffer2 )[pos] =
+                alpaka::getPtrNative( hostBuffer2 )[pos] =
                     ( float ) value;
 #else
                 hostBuffer2[pos] = ( float ) value;
@@ -484,13 +484,13 @@ void read_vtk_to_memory(
     }
 
 #if ISAAC_ALPAKA == 1
-            const alpaka::vec::Vec <alpaka::dim::DimInt< 1 >, ISAAC_IDX_TYPE>
+            const alpaka::Vec <alpaka::DimInt< 1 >, ISAAC_IDX_TYPE>
                 data_size(
                 ISAAC_IDX_TYPE( local_size[0] )
                 * ISAAC_IDX_TYPE( local_size[1] )
                 * ISAAC_IDX_TYPE( local_size[2] )
             );
-            alpaka::mem::view::copy(
+            alpaka::memcpy(
                 stream,
                 deviceBuffer2,
                 hostBuffer2,