Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycroscopy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
Vasudevan, Rama K.
pycroscopy
Commits
c254bf20
Commit
c254bf20
authored
8 years ago
by
Chris Smith
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Commented out unimplemented imports"
This reverts commit
f6b76db8
.
parent
f6b76db8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!11
see commits
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pycroscopy/processing/__init__.py
+14
-14
14 additions, 14 deletions
pycroscopy/processing/__init__.py
with
14 additions
and
14 deletions
pycroscopy/processing/__init__.py
+
14
−
14
View file @
c254bf20
...
...
@@ -8,17 +8,17 @@ def no_impl(*args,**kwargs):
raise
NotImplementedError
(
"
You need to install Multiprocess package (pip,github) to do a parallel Computation.
\n
"
"
Switching to the serial version.
"
)
#
from .feature_extraction import FeatureExtractorParallel, FeatureExtractorSerial
#
from .geometric_transformation import geoTransformerParallel, geoTransformerSerial
#
#
FeatureExtractor = FeatureExtractorSerial
#
geoTransformer = geoTransformerSerial
#
#
try:
#
import multiprocess
#
except ImportError:
#
FeatureExtractorParallel = no_impl
#
geoTransformerParallel = no_impl
#
else:
#
FeatureExtractor = FeatureExtractorParallel
#
geoTransformer = geoTransformerParallel
from
.feature_extraction
import
FeatureExtractorParallel
,
FeatureExtractorSerial
from
.geometric_transformation
import
geoTransformerParallel
,
geoTransformerSerial
FeatureExtractor
=
FeatureExtractorSerial
geoTransformer
=
geoTransformerSerial
try
:
import
multiprocess
except
ImportError
:
FeatureExtractorParallel
=
no_impl
geoTransformerParallel
=
no_impl
else
:
FeatureExtractor
=
FeatureExtractorParallel
geoTransformer
=
geoTransformerParallel
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