From 944bb24eaa8c3ef630452dfcd62b23cb019d49c8 Mon Sep 17 00:00:00 2001 From: Tushar Athawale Date: Thu, 3 Feb 2022 19:51:35 -0500 Subject: [PATCH] nested folders removed for tutorial examples --- tutorial/CMakeLists.txt | 60 ++++++++++++++++- tutorial/{tutorialExamples => }/README.md | 0 .../{tutorialExamples => }/data/kitchen.vtk | 0 .../{tutorialExamples => }/tut_2filters.cxx | 0 .../{tutorialExamples => }/tut_contour.cxx | 0 .../tut_contour_2fields.cxx | 0 .../tut_error_handling.cxx | 0 .../tut_extract_edges.cxx | 0 tutorial/{tutorialExamples => }/tut_io.cxx | 0 .../{tutorialExamples => }/tut_logging.cxx | 0 .../{tutorialExamples => }/tut_mag_grad.cxx | 0 .../tut_mag_grad_generalized.cxx | 0 .../tut_point_to_cell.cxx | 0 .../{tutorialExamples => }/tut_rendering.cxx | 0 tutorial/tutorialExamples/CMakeLists.txt | 67 ------------------- tutorial/tutorialExamples/azure-pipelines.yml | 32 --------- 16 files changed, 59 insertions(+), 100 deletions(-) rename tutorial/{tutorialExamples => }/README.md (100%) rename tutorial/{tutorialExamples => }/data/kitchen.vtk (100%) rename tutorial/{tutorialExamples => }/tut_2filters.cxx (100%) rename tutorial/{tutorialExamples => }/tut_contour.cxx (100%) rename tutorial/{tutorialExamples => }/tut_contour_2fields.cxx (100%) rename tutorial/{tutorialExamples => }/tut_error_handling.cxx (100%) rename tutorial/{tutorialExamples => }/tut_extract_edges.cxx (100%) rename tutorial/{tutorialExamples => }/tut_io.cxx (100%) rename tutorial/{tutorialExamples => }/tut_logging.cxx (100%) rename tutorial/{tutorialExamples => }/tut_mag_grad.cxx (100%) rename tutorial/{tutorialExamples => }/tut_mag_grad_generalized.cxx (100%) rename tutorial/{tutorialExamples => }/tut_point_to_cell.cxx (100%) rename tutorial/{tutorialExamples => }/tut_rendering.cxx (100%) delete mode 100644 tutorial/tutorialExamples/CMakeLists.txt delete mode 100644 tutorial/tutorialExamples/azure-pipelines.yml diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index a82ce54ce..2ee9f5d4b 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -12,4 +12,62 @@ #path so that our examples can find VTK-m set(CMAKE_PREFIX_PATH ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}) -add_subdirectory(tutorialExamples) + +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) +project(VTKm_tut) + +#Find the VTK-m package +find_package(VTKm REQUIRED QUIET) + +add_executable(tut_io tut_io.cxx) +target_link_libraries(tut_io vtkm_filter vtkm_io) + +add_executable(tut_contour tut_contour.cxx) +target_link_libraries(tut_contour vtkm_filter vtkm_io) + +add_executable(tut_contour_2fields tut_contour_2fields.cxx) +target_link_libraries(tut_contour_2fields vtkm_filter vtkm_io) + +add_executable(tut_2filters tut_2filters.cxx) +target_link_libraries(tut_2filters vtkm_filter vtkm_io) + +add_executable(tut_mag_grad tut_mag_grad.cxx) +target_link_libraries(tut_mag_grad vtkm_filter vtkm_io) + +if (VTKm_ENABLE_RENDERING) + add_executable(tut_rendering tut_rendering.cxx) + target_link_libraries(tut_rendering vtkm_filter vtkm_io vtkm_rendering) +endif() + +add_executable(tut_error_handling tut_error_handling.cxx) +target_link_libraries(tut_error_handling vtkm_filter vtkm_io) + +add_executable(tut_logging tut_logging.cxx) +target_link_libraries(tut_logging vtkm_filter vtkm_io) + +add_executable(tut_point_to_cell tut_point_to_cell.cxx) +target_link_libraries(tut_point_to_cell vtkm_cont vtkm_filter vtkm_io) + +add_executable(tut_extract_edges tut_extract_edges.cxx) +target_link_libraries(tut_extract_edges vtkm_cont vtkm_filter vtkm_io) + + +set(tutorial_targets tut_io tut_contour tut_contour_2fields tut_2filters tut_mag_grad tut_error_handling tut_logging tut_point_to_cell tut_extract_edges) + +set(tutorial_sources tut_io.cxx tut_contour.cxx tut_contour_2fields.cxx tut_2filters.cxx tut_mag_grad.cxx tut_error_handling.cxx tut_logging.cxx tut_point_to_cell.cxx tut_extract_edges.cxx) + +if (VTKm_ENABLE_RENDERING) + list(APPEND tutorial_sources tut_rendering.cxx) + list(APPEND tutorial_targets tut_rendering) +endif() + + +vtkm_add_target_information(${tutorial_targets} + DROP_UNUSED_SYMBOLS + MODIFY_CUDA_FLAGS + DEVICE_SOURCES + tutorial_sources) + + +# Copy the data file to be adjacent to the binaries +file(GENERATE OUTPUT "$/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk") \ No newline at end of file diff --git a/tutorial/tutorialExamples/README.md b/tutorial/README.md similarity index 100% rename from tutorial/tutorialExamples/README.md rename to tutorial/README.md diff --git a/tutorial/tutorialExamples/data/kitchen.vtk b/tutorial/data/kitchen.vtk similarity index 100% rename from tutorial/tutorialExamples/data/kitchen.vtk rename to tutorial/data/kitchen.vtk diff --git a/tutorial/tutorialExamples/tut_2filters.cxx b/tutorial/tut_2filters.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_2filters.cxx rename to tutorial/tut_2filters.cxx diff --git a/tutorial/tutorialExamples/tut_contour.cxx b/tutorial/tut_contour.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_contour.cxx rename to tutorial/tut_contour.cxx diff --git a/tutorial/tutorialExamples/tut_contour_2fields.cxx b/tutorial/tut_contour_2fields.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_contour_2fields.cxx rename to tutorial/tut_contour_2fields.cxx diff --git a/tutorial/tutorialExamples/tut_error_handling.cxx b/tutorial/tut_error_handling.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_error_handling.cxx rename to tutorial/tut_error_handling.cxx diff --git a/tutorial/tutorialExamples/tut_extract_edges.cxx b/tutorial/tut_extract_edges.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_extract_edges.cxx rename to tutorial/tut_extract_edges.cxx diff --git a/tutorial/tutorialExamples/tut_io.cxx b/tutorial/tut_io.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_io.cxx rename to tutorial/tut_io.cxx diff --git a/tutorial/tutorialExamples/tut_logging.cxx b/tutorial/tut_logging.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_logging.cxx rename to tutorial/tut_logging.cxx diff --git a/tutorial/tutorialExamples/tut_mag_grad.cxx b/tutorial/tut_mag_grad.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_mag_grad.cxx rename to tutorial/tut_mag_grad.cxx diff --git a/tutorial/tutorialExamples/tut_mag_grad_generalized.cxx b/tutorial/tut_mag_grad_generalized.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_mag_grad_generalized.cxx rename to tutorial/tut_mag_grad_generalized.cxx diff --git a/tutorial/tutorialExamples/tut_point_to_cell.cxx b/tutorial/tut_point_to_cell.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_point_to_cell.cxx rename to tutorial/tut_point_to_cell.cxx diff --git a/tutorial/tutorialExamples/tut_rendering.cxx b/tutorial/tut_rendering.cxx similarity index 100% rename from tutorial/tutorialExamples/tut_rendering.cxx rename to tutorial/tut_rendering.cxx diff --git a/tutorial/tutorialExamples/CMakeLists.txt b/tutorial/tutorialExamples/CMakeLists.txt deleted file mode 100644 index 1633bb580..000000000 --- a/tutorial/tutorialExamples/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -##============================================================================ -## Copyright (c) Kitware, Inc. -## All rights reserved. -## See LICENSE.txt for details. -## -## This software is distributed WITHOUT ANY WARRANTY; without even -## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -## PURPOSE. See the above copyright notice for more information. -##============================================================================ -cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) -project(VTKm_tut) - -#Find the VTK-m package -find_package(VTKm REQUIRED QUIET) - -add_executable(tut_io tut_io.cxx) -target_link_libraries(tut_io vtkm_filter vtkm_io) - -add_executable(tut_contour tut_contour.cxx) -target_link_libraries(tut_contour vtkm_filter vtkm_io) - -add_executable(tut_contour_2fields tut_contour_2fields.cxx) -target_link_libraries(tut_contour_2fields vtkm_filter vtkm_io) - -add_executable(tut_2filters tut_2filters.cxx) -target_link_libraries(tut_2filters vtkm_filter vtkm_io) - -add_executable(tut_mag_grad tut_mag_grad.cxx) -target_link_libraries(tut_mag_grad vtkm_filter vtkm_io) - -if (VTKm_ENABLE_RENDERING) - add_executable(tut_rendering tut_rendering.cxx) - target_link_libraries(tut_rendering vtkm_filter vtkm_io vtkm_rendering) -endif() - -add_executable(tut_error_handling tut_error_handling.cxx) -target_link_libraries(tut_error_handling vtkm_filter vtkm_io) - -add_executable(tut_logging tut_logging.cxx) -target_link_libraries(tut_logging vtkm_filter vtkm_io) - -add_executable(tut_point_to_cell tut_point_to_cell.cxx) -target_link_libraries(tut_point_to_cell vtkm_cont vtkm_filter vtkm_io) - -add_executable(tut_extract_edges tut_extract_edges.cxx) -target_link_libraries(tut_extract_edges vtkm_cont vtkm_filter vtkm_io) - - -set(tutorial_targets tut_io tut_contour tut_contour_2fields tut_2filters tut_mag_grad tut_error_handling tut_logging tut_point_to_cell tut_extract_edges) - -set(tutorial_sources tut_io.cxx tut_contour.cxx tut_contour_2fields.cxx tut_2filters.cxx tut_mag_grad.cxx tut_error_handling.cxx tut_logging.cxx tut_point_to_cell.cxx tut_extract_edges.cxx) - -if (VTKm_ENABLE_RENDERING) - list(APPEND tutorial_sources tut_rendering.cxx) - list(APPEND tutorial_targets tut_rendering) -endif() - - -vtkm_add_target_information(${tutorial_targets} - DROP_UNUSED_SYMBOLS - MODIFY_CUDA_FLAGS - DEVICE_SOURCES - tutotial_sources) - - -# Copy the data file to be adjacent to the binaries -file(GENERATE OUTPUT "$/data/kitchen.vtk" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/data/kitchen.vtk") diff --git a/tutorial/tutorialExamples/azure-pipelines.yml b/tutorial/tutorialExamples/azure-pipelines.yml deleted file mode 100644 index c87cdd596..000000000 --- a/tutorial/tutorialExamples/azure-pipelines.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Verify VTK-m tutorial pipeline - -schedules: -- cron: "0 0 * * *" - displayName: Nighly build - branches: - include: - - master - always: true - -# Also run builds each time master changes -trigger: -- master - -pool: - vmImage: 'ubuntu-16.04' -jobs: -- job: BuildAndVerify - timeoutInMinutes: 100 - steps: - - script: | - sudo apt update -qq - sudo apt install -y ninja-build - sudo apt clean - wget https://github.com/Kitware/CMake/releases/download/v3.15.1/cmake-3.15.1-Linux-x86_64.sh - chmod +x cmake-3.15.1-Linux-x86_64.sh - ./cmake-3.15.1-Linux-x86_64.sh --skip-license --prefix=${PWD} - displayName: 'Setup Env with CMake 3.15, and Ninja' - - - script: | - ./.azure/build.sh ${PWD}/bin/cmake - displayName: 'Build VTK-m and tutorials'