Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
6a95f707
"platforms/vscode:/vscode.git/clone" did not exist on "6cde1860bc17b7aef136e2cfbefd7da931ac325e"
Commit
6a95f707
authored
Feb 28, 2014
by
Robert McGibbon
Browse files
change travis?
parent
fc21ec77
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
.travis.yml
.travis.yml
+1
-2
openmmapi/src/ThreadPool.cpp
openmmapi/src/ThreadPool.cpp
+10
-1
No files found.
.travis.yml
View file @
6a95f707
...
@@ -10,8 +10,7 @@ before_install:
...
@@ -10,8 +10,7 @@ before_install:
-
export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.3
-
export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.3
script
:
script
:
-
mkdir build; cd build
-
cmake -DCMAKE_INSTALL_PREFIX=~/OpenMM -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-g -fsanitize=address -fno-omit-frame-pointer -O2" .
-
cmake -DCMAKE_INSTALL_PREFIX=~/OpenMM -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-g -fsanitize=address -fno-omit-frame-pointer -O2" ..
-
make
-
make
-
make test
-
make test
-
make install
-
make install
...
...
openmmapi/src/ThreadPool.cpp
View file @
6a95f707
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. *
* USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */
* -------------------------------------------------------------------------- */
#include <stdlib.h>
#include "openmm/internal/ThreadPool.h"
#include "openmm/internal/ThreadPool.h"
#include "openmm/internal/hardware.h"
#include "openmm/internal/hardware.h"
...
@@ -61,7 +62,15 @@ static void* threadBody(void* args) {
...
@@ -61,7 +62,15 @@ static void* threadBody(void* args) {
}
}
ThreadPool
::
ThreadPool
()
{
ThreadPool
::
ThreadPool
()
{
char
*
openmmNumThreads
=
getenv
(
"OPENMM_NUM_THREADS"
);
char
*
end
=
openmmNumThreads
;
if
(
openmmNumThreads
!=
NULL
)
{
numThreads
=
strtol
(
openmmNumThreads
,
&
end
,
0
);
}
if
(
openmmNumThreads
==
NULL
||
openmmNumThreads
==
end
)
{
numThreads
=
getNumProcessors
();
numThreads
=
getNumProcessors
();
}
pthread_cond_init
(
&
startCondition
,
NULL
);
pthread_cond_init
(
&
startCondition
,
NULL
);
pthread_cond_init
(
&
endCondition
,
NULL
);
pthread_cond_init
(
&
endCondition
,
NULL
);
pthread_mutex_init
(
&
lock
,
NULL
);
pthread_mutex_init
(
&
lock
,
NULL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment