Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tbgl
tools
arbd
Commits
f678e6d9
Commit
f678e6d9
authored
7 years ago
by
cmaffeo2
Browse files
Options
Downloads
Patches
Plain Diff
Made revision be automatically included in build
parent
a361c004
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile
+15
-0
15 additions, 0 deletions
src/Makefile
src/arbd.cpp
+7
-3
7 additions, 3 deletions
src/arbd.cpp
with
22 additions
and
3 deletions
src/Makefile
+
15
−
0
View file @
f678e6d9
...
...
@@ -2,6 +2,7 @@
include
./findcudalib.mk
INCLUDE
=
$(
CUDA_PATH
)
/include
ifeq
($(dbg),1)
NV_FLAGS
+=
-g
-G
EX_FLAGS
=
-g
-O0
-m
$(
OS_SIZE
)
...
...
@@ -9,6 +10,20 @@ else
EX_FLAGS
=
-O3
-m
$(
OS_SIZE
)
endif
## Determine the version; TODO add tags for versions
ifndef
(VERSION)
ifeq
($(shell git status >& /dev/null && echo true),true)
VERSION
:=
git rev.
$(
shell git rev-parse HEAD |
sed
's/\(.\{8\}\).*/\1/'
)
ifneq
($(shell git status --porcelain),)
VERSION
:=
$(
VERSION
)
(
modified
)
endif
else
VERSION
:=
unknown
(
not compiled
in
a git repository
)
endif
endif
CC_FLAGS
+=
-DVERSION
=
"
\"
$(
VERSION
)
\"
"
CC_FLAGS
+=
-I
$(
CUDA_PATH
)
/include
CC_FLAGS
+=
-Wall
-Wno-write-strings
-std
=
c++0x
-pedantic
# TODO: test on Mac OSX and other architectures
NV_FLAGS
+=
-lineinfo
...
...
This diff is collapsed.
Click to expand it.
src/arbd.cpp
+
7
−
3
View file @
f678e6d9
...
...
@@ -31,7 +31,12 @@ int main(int argc, char* argv[]) {
return
0
;
}
else
if
(
argc
==
2
&&
(
strcmp
(
argv
[
1
],
"--version"
)
==
0
))
{
// --version
printf
(
"%s Nov 2016 (alpha)
\n
"
,
argv
[
0
]);
// printf("%s Nov 2016 (alpha)\n", argv[0]);
#ifdef VERSION
printf
(
"%s %s
\n
"
,
argv
[
0
],
VERSION
);
#else
printf
(
"%s Nov 2016 (alpha)
\n
"
,
argv
[
0
]);
#endif
return
0
;
}
else
if
(
argc
==
2
&&
(
strcmp
(
argv
[
1
],
"--info"
)
==
0
))
{
// --info
...
...
@@ -46,8 +51,7 @@ int main(int argc, char* argv[]) {
// printf("Everything's great when you're...BrownTown\n");
printf
(
" –––––––––––––––––––––––––––––––––––––––––––––
\n
"
);
printf
(
" | Atomic Resolution Brownian Dynamics |
\n
"
);
printf
(
" –––––––––––––––––––––––––––––––––––––––––––––
\n\n
"
);
printf
(
" –––––––––––––––––––––––––––––––––––––––––––––
\n
"
);
GPUManager
::
init
();
size_t
n_gpus
=
max
(
GPUManager
::
gpus
.
size
(),
1lu
);
...
...
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