Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
ScalFMM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
ScalFMM
Commits
5f801fe8
Commit
5f801fe8
authored
9 years ago
by
BRAMAS Berenger
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot//scalfmm/scalfmm
parents
871b108c
936c1978
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Addons/CKernelApi/Tests/testMpiUserKernel.c
+4
-0
4 additions, 0 deletions
Addons/CKernelApi/Tests/testMpiUserKernel.c
CMakeLists.txt
+12
-12
12 additions, 12 deletions
CMakeLists.txt
with
16 additions
and
12 deletions
Addons/CKernelApi/Tests/testMpiUserKernel.c
+
4
−
0
View file @
5f801fe8
...
...
@@ -10,6 +10,10 @@
#include
"../../Src/Kernels/Chebyshev/FChebInterface.h"
// ==== CMAKE =====
// @FUSE_MPI
// ================
/**
* This file is an example of the user defined kernel API, with link
* to our Chebyshev Kernel
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
12
−
12
View file @
5f801fe8
...
...
@@ -14,13 +14,13 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
project
(
SCALFMM C CXX
)
# check if compiling into source directories
string
(
COMPARE EQUAL
"
${
CMAKE_SOURCE_DIR
}
"
"
${
CMAKE_BINARY_DIR
}
"
insource
)
string
(
COMPARE EQUAL
"
${
CMAKE_
CURRENT_
SOURCE_DIR
}
"
"
${
CMAKE_
CURRENT_
BINARY_DIR
}
"
insource
)
if
(
insource
)
message
(
FATAL_ERROR
"
${
PROJECT_NAME
}
requires an out of source build. Goto ./Build and tapes cmake ../"
)
endif
(
insource
)
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/CMakeModules/
)
set
(
SCALFMM_CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/CMakeModules
)
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/
)
set
(
SCALFMM_CMAKE_MODULE_PATH
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules
)
#
# Adds the CMAKE_DEPENDENT_OPTION command
INCLUDE
(
CMakeDependentOption
)
...
...
@@ -40,7 +40,7 @@ set(SCALFMM_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}.${SCALFM
set
(
MORSE_DISTRIB_DIR
""
CACHE PATH
"Directory of MORSE distribution"
)
if
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse/"
)
if
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse/"
)
# Add extra cmake module path and initialize morse cmake modules
# --------------------------------------------------------------
...
...
@@ -48,9 +48,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
list
(
APPEND CMAKE_MODULE_PATH
${
MORSE_DISTRIB_DIR
}
/cmake_modules
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
MORSE_DISTRIB_DIR
}
/cmake_modules/morse"
)
set
(
MORSE_CMAKE_MODULE_PATH
${
MORSE_DISTRIB_DIR
}
/cmake_modules/morse
)
elseif
(
EXISTS
"
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse/"
)
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse/
)
set
(
MORSE_CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse
)
elseif
(
EXISTS
"
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse/"
)
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse/
)
set
(
MORSE_CMAKE_MODULE_PATH
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse
)
endif
()
include
(
MorseInit
)
#
...
...
@@ -459,7 +459,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
set
(
CUDA_NEEDED_INCLUDE_DIRS
${
CMAKE_BINARY_DIR
}
/Src
)
set
(
CUDA_NEEDED_INCLUDE_DIRS
${
CMAKE_
CURRENT_
BINARY_DIR
}
/Src
)
endif
()
# Find StarPU with a list of optional components
...
...
@@ -705,7 +705,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
LIST
(
APPEND SCALFMM_COMPILE_LIBS
${
lib_var
}
)
endforeach
()
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/Src/ScalFmmConfig.h.cmake
${
CMAKE_BINARY_DIR
}
/Src/ScalFmmConfig.h
)
${
CMAKE_
CURRENT_
BINARY_DIR
}
/Src/ScalFmmConfig.h
)
#
##################################################################
# Build - lib #
...
...
@@ -822,7 +822,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
set
(
CPACK_SOURCE_GENERATOR
"TGZ"
)
set
(
CPACK_SOURCE_PACKAGE_FILE_NAME
"SCALFMM-
${
SCALFMM_MAJOR_VERSION
}
.
${
SCALFMM_MINOR_VERSION
}
-
${
CPACK_PACKAGE_VERSION_PATCH
}
"
)
set
(
CPACK_SOURCE_IGNORE_FILES
"
\\\\
.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;scalfmm.pro*;org.eclipse.core.resources.prefs;.cproject;.project"
)
list
(
APPEND CPACK_SOURCE_IGNORE_FILES
"
${
CMAKE_BINARY_DIR
}
;
${
CMAKE_SOURCE_DIR
}
/Utils/;Notes;Deprecated;/Build*;/noDist/;/Bench;ToRemove;Olivier"
)
list
(
APPEND CPACK_SOURCE_IGNORE_FILES
"
${
CMAKE_
CURRENT_
BINARY_DIR
}
;
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/Utils/;Notes;Deprecated;/Build*;/noDist/;/Bench;ToRemove;Olivier"
)
# Uniform;GroupTree;Adaptive;testUnif*;/*Lagrange*")
#list(APPEND CPACK_SOURCE_IGNORE_FILES "Stages;Uniform;Adaptive;testUnif*;*Lagrange*" )
#
...
...
@@ -858,7 +858,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
# END #
##################################################################
else
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse/"
)
else
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse/"
)
message
(
STATUS
"MORSE_DISTRIB_DIR is not set"
)
message
(
STATUS
"Please indicate where is located your MORSE distribution directory."
...
...
@@ -866,4 +866,4 @@ else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
message
(
STATUS
"If you are a MORSE developer, you normally have access to the svn repository of the MORSE_DISTRIB_DIR: "
"svn checkout svn+ssh://yourlogin@scm.gforge.inria.fr/svnroot/morse/trunk/morse_distrib"
)
endif
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_SOURCE_DIR
}
/CMakeModules/morse/"
)
endif
(
MORSE_DISTRIB_DIR OR EXISTS
"
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules/morse/"
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment