Skip to content
Snippets Groups Projects
Commit 6bbd6e2e authored by Thomas Vierjahn's avatar Thomas Vierjahn
Browse files

Merge branch 'feature/reenable_cubex_file_loading' into develop

parents 0fea99fc 943d7994
No related branches found
No related tags found
No related merge requests found
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,6 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(pv_app)
include( "./src/_SourceFiles.cmake" ) include( "./src/_SourceFiles.cmake" )
set(UI) set(UI)
...@@ -93,7 +89,7 @@ include_directories(../qpvt/include) ...@@ -93,7 +89,7 @@ include_directories(../qpvt/include)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Create executable # Create executable
add_executable(${PROJECT_NAME} MACOSX_BUNDLE add_executable(pv_app MACOSX_BUNDLE
${ProjectSources} ${ProjectSources}
${QT_UI_SRCS} ${QT_UI_SRCS}
${QT_RCC_SRCS} ${QT_RCC_SRCS}
...@@ -101,7 +97,7 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE ...@@ -101,7 +97,7 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE
if (APPLE) if (APPLE)
# Use Retina on Mac OS # Use Retina on Mac OS
set_target_properties(${PROJECT_NAME} set_target_properties(pv_app
PROPERTIES MACOSX_BUNDLE_INFO_PLIST PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in) ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in)
...@@ -110,7 +106,7 @@ if (APPLE) ...@@ -110,7 +106,7 @@ if (APPLE)
endif() endif()
# Link libraries # Link libraries
target_link_libraries(${PROJECT_NAME} target_link_libraries(pv_app
${FFTW_LIBRARIES} ${FFTW_LIBRARIES}
${FFTWF_LIBRARIES} ${FFTWF_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
...@@ -122,7 +118,7 @@ target_link_libraries(${PROJECT_NAME} ...@@ -122,7 +118,7 @@ target_link_libraries(${PROJECT_NAME}
) )
if (WIN32) if (WIN32)
target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARY}) target_link_libraries(pv_app ${GLEW_LIBRARY})
endif() endif()
# Configure .vcxproj.user to set the working directory and environment path if VS. # Configure .vcxproj.user to set the working directory and environment path if VS.
...@@ -131,6 +127,6 @@ if (MSVC) ...@@ -131,6 +127,6 @@ if (MSVC)
get_filename_component(GLEW_DIRECTORY ${GLEW_LIBRARY} PATH) get_filename_component(GLEW_DIRECTORY ${GLEW_LIBRARY} PATH)
set(ENVIRONMENT_PATH ${FFTW_DIRECTORY};${GLEW_DIRECTORY};$ENV{QT5_DIR}/bin/;${pvt_BINARY_DIR}/\$\(Configuration\);${qpvt_BINARY_DIR}/\$\(Configuration\)) set(ENVIRONMENT_PATH ${FFTW_DIRECTORY};${GLEW_DIRECTORY};$ENV{QT5_DIR}/bin/;${pvt_BINARY_DIR}/\$\(Configuration\);${qpvt_BINARY_DIR}/\$\(Configuration\))
configure_file(${CMAKE_SOURCE_DIR}/cmake/VisualStudioUserFileTemplate.xml configure_file(${CMAKE_SOURCE_DIR}/cmake/VisualStudioUserFileTemplate.xml
${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}.vcxproj.user ${CMAKE_BINARY_DIR}/pv_app/pv_app.vcxproj.user
@ONLY) @ONLY)
endif() endif()
...@@ -25,14 +25,10 @@ ...@@ -25,14 +25,10 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(pvt)
include( "./_SourceFiles.cmake" ) include( "./_SourceFiles.cmake" )
# Assign source groups. # Assign source groups.
include("${CMAKE_SOURCE_DIR}/cmake/assign_source_group.cmake") include(assign_source_group)
assign_source_group(${SourceFiles}) assign_source_group(${SourceFiles})
# Find includes in corresponding build directories # Find includes in corresponding build directories
...@@ -88,27 +84,27 @@ set(BUILD_SHARED OFF CACHE BOOL "Build as a shared library.") ...@@ -88,27 +84,27 @@ set(BUILD_SHARED OFF CACHE BOOL "Build as a shared library.")
# Create library # Create library
if (BUILD_SHARED) if (BUILD_SHARED)
add_library(${PROJECT_NAME} SHARED ${SourceFiles} ./_SourceFiles.cmake) add_library(pvt SHARED ${SourceFiles} ./_SourceFiles.cmake)
add_definitions(-DPVT_DLL -DPVT_EXPORT) add_definitions(-DPVT_DLL -DPVT_EXPORT)
else () else ()
add_library(${PROJECT_NAME} ${SourceFiles} ./_SourceFiles.cmake) add_library(pvt ${SourceFiles} ./_SourceFiles.cmake)
endif() endif()
target_link_libraries(${PROJECT_NAME} target_link_libraries(pvt
${FFTW_LIBRARIES} ${FFTW_LIBRARIES}
${FFTWF_LIBRARIES} ${FFTWF_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
) )
if(WIN32) if(WIN32)
target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARY}) target_link_libraries(pvt ${GLEW_LIBRARY})
endif() endif()
if(NOT WITHOUT_CUBE) if(NOT WITHOUT_CUBE)
target_link_libraries(${PROJECT_NAME} ${CUBE_LIBRARIES}) target_link_libraries(pvt ${CUBE_LIBRARIES})
endif() endif()
set(${PROJECT_NAME}_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) set(pvt_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# tests # tests
......
...@@ -51,6 +51,36 @@ perf_data_file_cube_cartesian_topology_loader:: ...@@ -51,6 +51,36 @@ perf_data_file_cube_cartesian_topology_loader::
bool bool
perf_data_file_cube_cartesian_topology_loader::load perf_data_file_cube_cartesian_topology_loader::load
() ()
{
const std::size_t num_cart_topologies =mp_cube->get_cartv().size();
if (num_cart_topologies == 0)
{
const std::size_t data_size = mp_cube->get_locationv().size();
std::cout << "No cartesian topologies in cube file." << std::endl;
std::cout << "Constructing default 1D topology with ";
std::cout << data_size << " x 1 x 1 ";
std::cout << "entries." << std::endl;
const std::string topology_name("Default 1D");
const std::vector<std::string> dimension_names({{"default", "null", "null"}});
std::cout << data_size << std::endl;
cartesian_topology_index cart_topo_idx(
std::vector<std::size_t>{{data_size,1,1}});
data_array<std::size_t> pTopologyToDataMap(data_size);
for (std::size_t i = 0; i < data_size; ++i) {
pTopologyToDataMap.at(i) = i;
}
m_cartesian_topologies.emplace_back(0,
topology_name,
cart_topo_idx,
dimension_names,
pTopologyToDataMap);
}
else
{ {
m_cartesian_topologies.reserve(mp_cube->get_cartv().size()); m_cartesian_topologies.reserve(mp_cube->get_cartv().size());
...@@ -76,7 +106,7 @@ perf_data_file_cube_cartesian_topology_loader::load ...@@ -76,7 +106,7 @@ perf_data_file_cube_cartesian_topology_loader::load
dimension_names, dimension_names,
pTopologyToDataMap); pTopologyToDataMap);
} }
}
return true; return true;
} }
......
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,6 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(pvt_tests)
include( "./_SourceFiles.cmake" ) include( "./_SourceFiles.cmake" )
# Find includes in corresponding build directories # Find includes in corresponding build directories
......
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,6 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(qpvt)
include( "./_SourceFiles.cmake" ) include( "./_SourceFiles.cmake" )
# Assign source groups. # Assign source groups.
...@@ -98,13 +94,13 @@ set(BUILD_SHARED OFF CACHE BOOL "Build as a shared library.") ...@@ -98,13 +94,13 @@ set(BUILD_SHARED OFF CACHE BOOL "Build as a shared library.")
# Create library # Create library
if (BUILD_SHARED) if (BUILD_SHARED)
add_library(${PROJECT_NAME} SHARED ${SourceFiles} ./_SourceFiles.cmake) add_library(qpvt SHARED ${SourceFiles} ./_SourceFiles.cmake)
add_definitions(-DPVT_DLL -DQPVT_DLL -DQPVT_EXPORT) add_definitions(-DPVT_DLL -DQPVT_DLL -DQPVT_EXPORT)
else () else ()
add_library(${PROJECT_NAME} ${SourceFiles} ./_SourceFiles.cmake) add_library(qpvt ${SourceFiles} ./_SourceFiles.cmake)
endif() endif()
target_link_libraries(${PROJECT_NAME} target_link_libraries(qpvt
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
Qt5::Core Qt5::Core
Qt5::OpenGL Qt5::OpenGL
...@@ -113,7 +109,7 @@ target_link_libraries(${PROJECT_NAME} ...@@ -113,7 +109,7 @@ target_link_libraries(${PROJECT_NAME}
) )
if(WIN32) if(WIN32)
target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARY}) target_link_libraries(qpvt ${GLEW_LIBRARY})
endif() endif()
set(${PROJECT_NAME}_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) set(qpvt_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment