diff --git a/CMakeLists.txt b/CMakeLists.txt index a6cdbe933661ea578da1772f4e08bf9d512caa0e..a7e0a48a25c7704206f8a95c0edd18fd84963e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,9 @@ if(ENABLE_GPU) elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 0 ) message("CUDA is compatible 11.0") set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=3059 --diag_suppress=3058 --diag_suppress=3057 --diag_suppress=3056 --diag_suppress=611 --diag_suppress=186" --expt-extended-lambda) + elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 1 ) + message("CUDA is compatible 11.1") + set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=3124 --diag_suppress=3126 --diag_suppress=3125 --diag_suppress=3123 --diag_suppress=611 --diag_suppress=186 --diag_suppress=128" --expt-extended-lambda) else() message(FATAL_ERROR "CUDA is incompatible, version 9.2 10.1 and 10.2 is only supported") endif() diff --git a/src/RawReader/InitGridWithPixel.hpp b/src/RawReader/InitGridWithPixel.hpp index 01e23eca25bbc21394d28f9271d57de82afee39e..bd53a1ce70550f7a1c50de06000aa8c88dc4e2f8 100644 --- a/src/RawReader/InitGridWithPixel.hpp +++ b/src/RawReader/InitGridWithPixel.hpp @@ -129,7 +129,7 @@ void load_pixel_onto_grid(grid_type & grid, std::string file_name, std::vector < // in case that the grid has a different resolution than the underlying image stack: // create a key which is used to get the offset for the file reading // the indices in this key are corrected by the refinement factor - for (size_t d = 1; d < grid_type::dims; d++) + for (size_t d = 0; d < grid_type::dims; d++) { gkey.set_d(d, std::round(gkey.get(d) / refinement[d])); } diff --git a/src/VTKWriter/VTKWriter_graph.hpp b/src/VTKWriter/VTKWriter_graph.hpp index bb5be70cdf655d27b9a5913904e43f5ba80589fb..3b4bb1e61a00b564d4c0cd902b030c588915cd29 100644 --- a/src/VTKWriter/VTKWriter_graph.hpp +++ b/src/VTKWriter/VTKWriter_graph.hpp @@ -611,6 +611,7 @@ public: template<typename Graph, unsigned int i> class prop_output<false, Graph, i> { +public: /*! \brief Return the point data section for a graph g * * \param g graph @@ -774,7 +775,7 @@ class prop_output<false, Graph, i> */ static std::string get_attributes_vertex() { - return Graph::V_type::attributes::name[i]; + return std::string("attr" + std::to_string(i)); } /*! \brief Get the attributes name for edge @@ -784,7 +785,7 @@ class prop_output<false, Graph, i> */ static std::string get_attributes_edge() { - return Graph::E_type::attributes::name[i]; + return std::string("attr" + std::to_string(i)); } }; diff --git a/src/util/PathsAndFiles.hpp b/src/util/PathsAndFiles.hpp index e5cd27e52a1ef26b3c5bb9aa249438b4a5a8c1c8..92331d8aa1c9b9a6d6561c838361860fbfe27dfc 100644 --- a/src/util/PathsAndFiles.hpp +++ b/src/util/PathsAndFiles.hpp @@ -16,6 +16,7 @@ #include <iostream> #include <fstream> #include <boost/filesystem.hpp> +#include "VCluster/VCluster.hpp" /**@brief Gets the current working directory and returns path as string. * * @return Std::string of path to current working directory.