Correcting the mistake to resolve conflicts

git-svn-id: https://ipvs.informatik.uni-stuttgart.de/SGpp/repos/trunk@4643 4eea3252-f0fb-4393-894d-40516dce545b
SGpp · Jul 30, 2015 · b4e0e09 · b4e0e09
1 parent 30cb046
commit b4e0e09
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 29 deletions.
diff --git a/base/SConscript b/base/SConscript
@@ -9,7 +9,6 @@ import fnmatch
 
 Import('env')
 Import('BUILD_DIR')
-Import('EXAMPLE_DIR')
 Import('PYSGPP_BUILD_PATH')
 Import('moduleName')
 Import('libraryTargetList')
@@ -67,7 +66,6 @@ for fileName in os.listdir("examples"):
 if env['COMPILE_BOOST_TESTS']:
     Import('boostTestTargetList')
     test_env = env.Clone()
-    test_env.AppendUnique(LIBPATH=[BUILD_DIR, "#/lib/alglib"])
     test_env.AppendUnique(LIBS=libs + ["sgpp%s" % moduleName, "boost_unit_test_framework"])
     testObjects = []
     for fileName in os.listdir("tests"):

diff --git a/combigrid/SConscript b/combigrid/SConscript
@@ -30,7 +30,6 @@ lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         LIBPATH=BUILD_DIR,
                         LIBS=libs)
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
 
 libInstall = env.Install(BUILD_DIR, lib)

diff --git a/datadriven/SConscript b/datadriven/SConscript
@@ -29,7 +29,7 @@ def isAVXFolder(folder):
             return True
     return False
 
-libs = ['sgppbase', 'sgppsolver', 'libalglib', 'sgpppde']
+libs = ['sgppbase', 'sgppsolver', 'sgpppde']
 if env['USE_OCL']:
     libs += ['OpenCL']
 
@@ -45,21 +45,15 @@ for currentFolder, subdirNames, fileNames in os.walk("src", topdown=True):
       sourceFile = os.path.join(currentFolder, fileName)
       objs.append(env.SharedObject(sourceFile))
 
-env.AppendUnique(LIBPATH=[BUILD_DIR, "#/lib/alglib"])
+env.AppendUnique(LIBPATH=[BUILD_DIR])
 lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         source=objs,
-                        # LIBPATH = [BUILD_DIR, '#/lib/alglib'],
                         LIBS=libs)
 
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgpppde.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgpppde" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppsolver.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppsolver" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/lib/alglib" + "/libalglib.so")
-env.Depends(lib, "#/lib/alglib" + "/" + env["LIBPREFIX"] + "alglib" + env["SHLIBSUFFIX"])
 
 libInstall = env.Install(BUILD_DIR, lib)
 
@@ -85,7 +79,7 @@ for fileName in os.listdir("examples"):
 if env['COMPILE_BOOST_TESTS']:
     Import('boostTestTargetList')
     test_env = env.Clone()
-    test_env.AppendUnique(LIBPATH=[BUILD_DIR, "#/lib/alglib"])
+    test_env.AppendUnique(LIBPATH=[BUILD_DIR])
     test_env.AppendUnique(LIBS=libs + ["sgpp%s" % moduleName, "boost_unit_test_framework", "z"])
     testObjects = []
     for fileName in os.listdir("tests"):

diff --git a/finance/SConscript b/finance/SConscript
@@ -8,10 +8,14 @@ import fnmatch
 
 Import('env')
 Import('BUILD_DIR')
+Import('PYSGPP_BUILD_PATH')
 Import('EXAMPLE_DIR')
 Import('moduleName')
+Import('libraryTargetList')
+Import('installTargetList')
+Import('exampleTargetList')
 
-libs = ['sgppbase', 'sgpppde', 'sgppdatadriven']
+libs = ['sgppbase', 'sgpppde']
 
 srcs = []
 for currentFolder, subdirNames, fileNames in os.walk("."):
@@ -38,7 +42,6 @@ if not env['NO_UNIT_TESTS'] and env['SG_PYTHON']:
   env.Requires(moduleTest, libInstall)
   testTargetList.append(moduleTest)
 
-Import('exampleTargetList')
 for fileName in os.listdir("examples"):
     if fnmatch.fnmatch(fileName, "*.cpp"):
         example = env.Program(source=os.path.join("examples", fileName),
@@ -47,7 +50,6 @@ for fileName in os.listdir("examples"):
         env.Requires(example, libInstall)
         exampleTargetList.append(example)
 
-Import('libraryTargetList')
-Import('installTargetList')
+
 libraryTargetList.append(lib)
 installTargetList.append(libInstall)
diff --git a/optimization/SConscript b/optimization/SConscript
@@ -81,7 +81,6 @@ lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         LIBPATH=BUILD_DIR,
                         LIBS=libs)
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
 
 libInstall = env.Install(BUILD_DIR, lib)
@@ -104,7 +103,6 @@ for fileName in os.listdir("examples"):
 if env['COMPILE_BOOST_TESTS']:
     Import('boostTestTargetList')
     test_env = env.Clone()
-    test_env.AppendUnique(LIBPATH=[BUILD_DIR, "#/lib/alglib"])
     test_env.AppendUnique(LIBS=libs + ["sgpp%s" % moduleName, "boost_unit_test_framework"])
     testObjects = []
     for fileName in os.listdir("tests"):

diff --git a/parallel/SConscript b/parallel/SConscript
@@ -8,7 +8,6 @@ import fnmatch
 
 Import('env')
 Import('BUILD_DIR')
-Import('EXAMPLE_DIR')
 Import('moduleName')
 
 env_parallel = env.Clone()
@@ -118,13 +117,9 @@ lib = env_parallel.SharedLibrary(target="sgpp" + moduleName,
                                  source=objs,
                                  LIBPATH=BUILD_DIR,
                                  LIBS=libs)
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])                        
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgpppde.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgpppde" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppdatadriven.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppdatadriven" + env["SHLIBSUFFIX"])
-#env_parallel.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppsolver.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppsolver" + env["SHLIBSUFFIX"])
 libInstall = env_parallel.Install(BUILD_DIR, lib)
 

diff --git a/pde/SConscript b/pde/SConscript
@@ -8,7 +8,6 @@ import fnmatch
 
 Import('env')
 Import('BUILD_DIR')
-Import('EXAMPLE_DIR')
 Import('PYSGPP_BUILD_PATH')
 Import('moduleName')
 Import('libraryTargetList')
@@ -32,7 +31,6 @@ lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         LIBPATH=BUILD_DIR,
                         LIBS=libs)
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
 libInstall = env.Install(BUILD_DIR, lib)
 

diff --git a/quadrature/SConscript b/quadrature/SConscript
@@ -8,7 +8,6 @@ import fnmatch
 
 Import('env')
 Import('BUILD_DIR')
-Import('EXAMPLE_DIR')
 Import('PYSGPP_BUILD_PATH')
 Import('moduleName')
 Import('libraryTargetList')
@@ -33,7 +32,6 @@ lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         LIBPATH=BUILD_DIR,
                         LIBS=libs)
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
 
 libInstall = env.Install(BUILD_DIR, lib)

diff --git a/solver/SConscript b/solver/SConscript
@@ -33,9 +33,7 @@ lib = env.SharedLibrary(target="sgpp%s" % moduleName,
                         LIBPATH = [BUILD_DIR],
                         LIBS=libs)
 
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgpppde.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgpppde" + env["SHLIBSUFFIX"])
 
 libInstall = env.Install(BUILD_DIR, lib)