From 5e0fb5114a14740d8fdfc5c7fa1174c5a35d38dd Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Wed, 11 Nov 2015 16:22:43 -0600
Subject: [PATCH] changes to make needed to compile
---
DcdWriter.h | 7 +++----
makefile | 3 ++-
nvcc.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/DcdWriter.h b/DcdWriter.h
index b4c59bd..f2c0f61 100644
--- a/DcdWriter.h
+++ b/DcdWriter.h
@@ -14,9 +14,8 @@
output, so its pretty ugly. If you are squeamish, don't look!
*/
-
-#ifndef DCDWRITER_H
-#define DCDWRITER_H
+#pragma once
+#include <unistd.h>
#include <cstring>
#include <fstream>
#include <fcntl.h>
@@ -324,4 +323,4 @@ public:
return(0);
}
};
-#endif
+
diff --git a/makefile b/makefile
index c64722a..c5a3a6d 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,8 @@
### Paths, libraries, includes, options
# CUDA_PATH ?= /Developer/NVIDIA/CUDA-6.5
-CUDA_PATH ?= /software/cuda-toolkit-6.5-x86_64
+# CUDA_PATH ?= /software/cuda-toolkit-6.5-x86_64
+CUDA_PATH ?= /usr/local/cuda-7.0
#CUDA_PATH ?= /usr/local/encap/cuda-5.5
diff --git a/nvcc.sh b/nvcc.sh
index bae8b3a..3fc27ff 100755
--- a/nvcc.sh
+++ b/nvcc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Usage: source nvcc.sh
-module load cuda-toolkit
+# module load cuda-toolkit
# /software/cuda-toolkit-4.1-x86_64/cuda/bin/nvcc
# Add CUDA 'bin' folder to PATH
--
GitLab