Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyhst2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
myron
pyhst2
Commits
83b9afaf
Commit
83b9afaf
authored
Jul 16, 2019
by
Alessandro Mirone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Accelerated preprocessing
small correction
parent
04671592
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
12 deletions
+21
-12
PyHST/Control.py
PyHST/Control.py
+20
-11
PyHST/test/test_crayon.py
PyHST/test/test_crayon.py
+1
-1
No files found.
PyHST/Control.py
View file @
83b9afaf
#/*##########################################################################
# Copyright (C) 2001-2013 European Synchrotron Radiation Facility
#
...
...
@@ -123,29 +124,37 @@ class Control:
)
reading1
.
NEXTPOOL
=
[
preprocessing
]
else
:
# pour les cas encombrants
if
DO_FF2
:
tobefreed
=
[
"SiliciumResources"
]
else
:
tobefreed
=
preprocessing_frees
preprocessing0
=
Processing_InterleavedReadingPreProcessing
(
processingLevel
=
2
,
resources
=
{
"SiliciumResources"
:
self
.
SiliciumResources
,
"RawDataResources"
:
self
.
RawDataResources
,
"TreatedDataResources"
:
self
.
TreatedDataResources
,
},
resources_free
=
[
"SiliciumResources"
]
,
resources_free
=
tobefreed
,
pmanager
=
self
.
PacketsManager
,
STEAM_DIRECTION
=
STEAM_DIRECTION
,
FF2
=
DO_FF2
*
1
)
start
.
NEXTPOOL
=
[
preprocessing0
]
if
DO_FF2
:
# The threads are done computing their local mean. Now, one thread will reduce the results,
# And the process 0 will accumulate all the means
preprocessing
=
Processing_InterleavedReadingPreProcessing
(
processingLevel
=
4
,
resources
=
{
"SiliciumResources"
:
self
.
SiliciumResources
,
"RawDataResources"
:
self
.
RawDataResources
,
"TreatedDataResources"
:
self
.
TreatedDataResources
,
preprocessing
=
Processing_InterleavedReadingPreProcessing
(
processingLevel
=
4
,
resources
=
{
"SiliciumResources"
:
self
.
SiliciumResources
,
"RawDataResources"
:
self
.
RawDataResources
,
"TreatedDataResources"
:
self
.
TreatedDataResources
,
},
resources_free
=
preprocessing_frees
,
pmanager
=
self
.
PacketsManager
,
STEAM_DIRECTION
=
STEAM_DIRECTION
,
FF2
=
DO_FF2
*
2
resources_free
=
preprocessing_frees
,
pmanager
=
self
.
PacketsManager
,
STEAM_DIRECTION
=
STEAM_DIRECTION
,
FF2
=
DO_FF2
*
2
)
preprocessing0
.
NEXTPOOL
=
[
preprocessing
]
preprocessing0
.
NEXTPOOL
=
[
preprocessing
]
else
:
preprocessing
=
preprocessing0
## -----------------------------------------------------------------------------
...
...
@@ -825,7 +834,7 @@ class Processing_InterleavedReadingPreProcessing(ProcessingBaseClass):
## ----------------- data for specific requirement. Resources know their name -----------------------------
self
.
requiredCpusGpus
=
[
[
0
*
P
.
ncpus_expansion
]
,
0
]
self
.
requiredCpusGpus
=
[
[
1
*
P
.
ncpus_expansion
]
,
0
]
def
processSpecial
(
self
,
psn
):
...
...
PyHST/test/test_crayon.py
View file @
83b9afaf
...
...
@@ -306,7 +306,7 @@ def test_classes(testcase):
myclassi
=
{}
casi
=
{
# "CRAYON/TESTS/" : ( False , 0,[ "pag_una"]),
#
"CRAYON/TESTS/" : ( False , 0,[ "abs_solo_tutte", "abs_solo_unaslice", "pag_molte_edf", "pag_tutte", "pag_una"]),
"CRAYON/TESTS/"
:
(
False
,
0
,[
"abs_solo_tutte"
,
"abs_solo_unaslice"
,
"pag_molte_edf"
,
"pag_tutte"
,
"pag_una"
]),
# "HELICOIDAL/TESTS/" : ( False , 0,[ "abs_solo_una"]),
# "ID11_SNOW/TESTS/" : ( False , 1,[ "chambolle_pock"]),
...
...
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