Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tnl-dev
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
TNL
tnl-dev
Commits
2eba6e84
There was an error fetching the commit references. Please try again later.
Commit
2eba6e84
authored
6 years ago
by
Jakub Klinkovský
Browse files
Options
Downloads
Patches
Plain Diff
Removed TNL_CPP_COMPILER_NAME from tnlConfig.h
parent
632087b6
No related branches found
No related tags found
1 merge request
!22
Header only
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/TNL/Devices/SystemInfo.cpp
+18
-1
18 additions, 1 deletion
src/TNL/Devices/SystemInfo.cpp
tnlConfig.h.in
+0
-2
0 additions, 2 deletions
tnlConfig.h.in
with
18 additions
and
3 deletions
src/TNL/Devices/SystemInfo.cpp
+
18
−
1
View file @
2eba6e84
...
...
@@ -157,11 +157,28 @@ void
SystemInfo
::
writeDeviceInfo
(
Logger
&
logger
)
{
// compiler detection macros:
// http://nadeausoftware.com/articles/2012/10/c_c_tip_how_detect_compiler_name_and_version_using_compiler_predefined_macros
// https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compilation-phases
#if defined(__NVCC__)
#define TNL_STRINGIFY(x) #x
const
char
*
compiler_name
=
"Nvidia NVCC ("
TNL_STRINGIFY
(
__CUDACC_VER_MAJOR__
)
"."
TNL_STRINGIFY
(
__CUDACC_VER_MINOR__
)
"."
TNL_STRINGIFY
(
__CUDACC_VER_BUILD__
)
")"
;
#undef TNL_STRINGIFY
#elif defined(__clang__)
const
char
*
compiler_name
=
"Clang/LLVM ("
__VERSION__
")"
;
#elif defined(__ICC) || defined(__INTEL_COMPILER)
const
char
*
compiler_name
=
"Intel ICPC ("
__VERSION__
")"
;
#elif defined(__GNUC__) || defined(__GNUG__)
const
char
*
compiler_name
=
"GNU G++ ("
__VERSION__
")"
;
#else
const
char
*
compiler_name
=
"(unknown)"
;
#endif
logger
.
writeParameter
<
String
>
(
"Host name:"
,
getHostname
()
);
logger
.
writeParameter
<
String
>
(
"System:"
,
getSystemName
()
);
logger
.
writeParameter
<
String
>
(
"Release:"
,
getSystemRelease
()
);
logger
.
writeParameter
<
String
>
(
"Architecture:"
,
getArchitecture
()
);
logger
.
writeParameter
<
char
*
>
(
"TNL
C
ompiler:"
,
(
char
*
)
TNL_CPP_COMPILER_NAME
);
logger
.
writeParameter
<
String
>
(
"TNL
c
ompiler:"
,
compiler_name
);
// FIXME: generalize for multi-socket systems, here we consider only the first found CPU
const
int
cpu_id
=
0
;
const
int
threads
=
getNumberOfThreads
(
cpu_id
);
...
...
This diff is collapsed.
Click to expand it.
tnlConfig.h.in
+
0
−
2
View file @
2eba6e84
...
...
@@ -9,5 +9,3 @@
@HAVE_PNG_H@
@HAVE_JPEG_H@
#define TNL_CPP_COMPILER_NAME "@CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@"
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