Merge pull request #22 from DCM-UPB/new_nnvmc

Things that came up when setting up new NNVMC repo

.gitignore

@@ -113,9 +113,9 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-!ax_cxx_compile_stdcxx_11.m4
 
 # -- project specific ignores --
+config.sh
 exe
 exe.prof*
 vgcore* 
@@ -131,12 +131,10 @@ vgcore*
 *.trs
 
 test/*.txt
-test/ut*/run_single_unittest.sh
 test/ut*/*.txt
 
 benchmark/*/benchmark_*.out
 
-examples/*/a.out
 examples/*/*.txt
 examples/*/*/*.txt
 

README.md

@@ -24,19 +24,25 @@ However, in principle any system with C++11 supporting compiler should work, at
 
 # Build the library
 
-Make sure you have a reasonably recent development version (>=2.3?) of the GSL library installed on your system. Furthermore, we rely on the Autotools build system and libtool.
+Make sure you have a reasonably recent development version (>=2.3?) of the GSL library on your system. Furthermore, we rely on the Autotools build system and libtool.
 Optionally, if you have valgrind installed on your system, it will be used to check for memory errors when running unittests.
 
-If you have the prerequisites on your system, you have to setup the build environment by using the following script in the top level directory:
+If you have the GSL librariy in non-standard paths or want to use custom compiler flags, copy a little script:
+
+   `cp script/config_template.sh config.sh`
+
+Now edit `config.sh` to your needs and before proceeding run:
+
+   `source config.sh`
+
+If you have the prerequisites, you may setup the build environment by using the following script in the top level directory:
 
    `./autogen.sh`
 
 Now you want to configure the build process for your platform by invoking:
 
    `./configure`
 
-If you run into trouble here, `./configure --help` could be a start.
-
 Finally, you are ready to compile all the code files in our repository together, by:
 
    `make` or `make -jN`

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([NNVMC-FFNN], [0.1], [ithanil@mail.uni-paderborn.de])
+AC_INIT([FFNN], [0.1], [ithanil@mail.uni-paderborn.de])
 : ${CXXFLAGS=""} # delete default optimization user flags
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([m4])
@@ -142,7 +142,6 @@ examples/ex2/Makefile
 examples/Makefile
 examples/ex8/Makefile
 examples/ex3/Makefile
-doc/Makefile
 Makefile
 benchmark/bench_actfs_derivs/Makefile
 benchmark/Makefile

include/Makefile.am

@@ -1,4 +1,5 @@
 include-links:
 	rm -f *.hpp
-	ln -sf ../src/*/*.hpp ./
+	ln -s ../src/*/*.hpp ./
+
 .PHONY: include-links

include/ffnn

@@ -0,0 +1 @@
+./

script/config_template.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Config script for custom library and header paths or C++ compiler choice
+#
+# If you want to edit this template script/config_template.sh,
+# copy it over to something like config.sh and edit the gitignored copy.
+#
+
+# C++ compiler
+export CXX="g++"
+
+# C++ flags
+export CXXFLAGS=""
+
+# GSL Library
+GSL_L="-L/usr/local/lib"
+GSL_I="-I/usr/local/include"
+
+
+# ! DO NOT EDIT THE FOLLOWING !
+
+# linker flags
+export LDFLAGS="${GSL_L}"
+
+# pre-processor flags
+export CPPFLAGS="${GSL_I}"