Commit 85c64c59 authored by incardon's avatar incardon

Merge branch 'master' into 'develop'

Master

See merge request !1
parents b0b0f73d fd54dc1a
Pipeline #2427 failed with stages
in 1 minute and 13 seconds
......@@ -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()
......
......@@ -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]));
}
......
......@@ -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));
}
};
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment