Commit 42afe2c8 authored by Loic Esteve's avatar Loic Esteve Committed by Hardik Juneja

Some work by Rafael

parent 15f2005c
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
# #
############################################################################## ##############################################################################
from SQLQueue import SQLQueue from SQLDict import SQLDict
class SQLJoblib(SQLQueue): class SQLJoblib(SQLDict):
""" """
XXX SQLJoblib XXX SQLJoblib
""" """
......
...@@ -40,7 +40,7 @@ document_classes = updateGlobals(this_module, globals(), ...@@ -40,7 +40,7 @@ document_classes = updateGlobals(this_module, globals(),
# Finish installation # Finish installation
def initialize( context ): def initialize( context ):
# Define object classes and tools # Define object classes and tools
import ActivityTool, ActiveProcess, ActivityConnection import ActivityTool, ActiveProcess, ActivityConnection, ActivityJoblibBackend
object_classes = (ActiveProcess.ActiveProcess, object_classes = (ActiveProcess.ActiveProcess,
#ActivityConnection.ActivityConnection #ActivityConnection.ActivityConnection
) )
......
...@@ -87,6 +87,7 @@ from Products.ERP5Type.patches import ZopePageTemplate ...@@ -87,6 +87,7 @@ from Products.ERP5Type.patches import ZopePageTemplate
from Products.ERP5Type.patches import ZSQLMethod from Products.ERP5Type.patches import ZSQLMethod
from Products.ERP5Type.patches import MimetypesRegistry from Products.ERP5Type.patches import MimetypesRegistry
from Products.ERP5Type.patches import users from Products.ERP5Type.patches import users
from Products.ERP5Type.patches import JoblibParallelPrint
# These symbols are required for backward compatibility # These symbols are required for backward compatibility
from Products.ERP5Type.patches.PropertyManager import ERP5PropertyManager from Products.ERP5Type.patches.PropertyManager import ERP5PropertyManager
......
ENABLE_PATCH = True
try:
import sklearn
#from sklearn.externals import joblib
#from sklearn.externals.joblib.parallel import Parallel
from joblib.parallel import Parallel
except ImportError:
ENABLE_PATCH = False
if ENABLE_PATCH:
from zLOG import LOG, WARNING
def _print(self, msg, msg_args):
msg = msg % msg_args
LOG('Parallel._print', WARNING, '[%s]: %s\n' % (self, msg))
Parallel._print = _print
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment