From 0372670e8d414e1c8ba0b61a8b1f60a371f68f05 Mon Sep 17 00:00:00 2001 From: acdemiralp <demiralpali@gmail.com> Date: Thu, 4 Mar 2021 01:14:33 +0100 Subject: [PATCH] Remove the shells, we're going Windows only again. --- batch.sh | 13 ------------- install.sh | 40 ---------------------------------------- readme.md | 11 +++-------- run.sh | 5 ----- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100755 batch.sh delete mode 100755 install.sh delete mode 100755 run.sh diff --git a/batch.sh b/batch.sh deleted file mode 100755 index 86cf435..0000000 --- a/batch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -#SBATCH --job-name=ray_tracer -#SBATCH --output=ray_tracer.log -#SBATCH --time=00:10:00 -#SBATCH --mem=160000M -#SBATCH --nodes=1 -#SBATCH --ntasks=1 -#SBATCH --cpus-per-task=48 -#SBATCH --account=rwth0432 - -module load gcc/10 - -./offline_ray_tracer/build/offline_ray_tracer ./settings.json diff --git a/install.sh b/install.sh deleted file mode 100755 index 3aff6ae..0000000 --- a/install.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -module load gcc/10 - -mkdir dependencies -cd dependencies - -# Install CMake. -wget https://github.com/Kitware/CMake/releases/download/v3.19.4/cmake-3.19.4-Linux-x86_64.tar.gz -ZIP=cmake-3.19.4-Linux-x86_64.tar.gz -tar -xzvf $ZIP -rm $ZIP -mv ./cmake-3.19.4-Linux-x86_64 ./cmake-3.19.4 - -# Install Ospray. -wget https://github.com/ospray/ospray/releases/download/v1.8.5/ospray-1.8.5.x86_64.linux.tar.gz -ZIP=ospray-1.8.5.x86_64.linux.tar.gz -tar -xzvf $ZIP -rm $ZIP -mv ./ospray-1.8.5.x86_64.linux ./ospray-1.8.5 - -# Install VTK. -wget https://www.vtk.org/files/release/9.0/VTK-9.0.1.tar.gz -ZIP=VTK-9.0.1.tar.gz -tar -xzvf $ZIP -rm $ZIP -cd VTK-9.0.1 -mkdir build -cd build -export ospray_DIR=../../ospray-1.8.5/lib/cmake/ospray-1.8.5 -../../cmake-3.19.4/bin/cmake .. -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing=YES -DVTK_OPENGL_HAS_OSMESA=ON -DVTK_USE_X=OFF -../../cmake-3.19.4/bin/cmake --build . --config Release --parallel 64 - -# Install application. -cd ../../../offline_ray_tracer -mkdir build -cd build -export VTK_DIR=../../dependencies/VTK-9.0.1/build/lib64/cmake/vtk-9.0/ -../../dependencies/cmake-3.19.4/bin/cmake .. -../../dependencies/cmake-3.19.4/bin/cmake --build . --clean-first --config Release --parallel 64 -cd ../.. \ No newline at end of file diff --git a/readme.md b/readme.md index 9bfce9d..62a8afa 100644 --- a/readme.md +++ b/readme.md @@ -2,14 +2,9 @@ ### Dependencies - GCC 10+ - -### Installation -- Run `install.sh` which downloads CMake, Ospray, VTK, and then builds the tools. - -### Running -- Modify `settings.json` to locate the datasets and adjust camera path. -- For interactive mode, run `run.sh`. -- For batch mode, run `sbatch batch.sh`. +- CMake 3.19+ +- Ospray 1.8.5 +- VTK 9.0.1 ### Contact - If you encounter any problems, contact demiralp@vr.rwth-aachen.de . \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100755 index 1bea4cc..0000000 --- a/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -module load gcc/10 - -./offline_ray_tracer/build/offline_ray_tracer ./settings.json -- GitLab