Skip to content

Commit 6bc2b8e

Browse files
author
sreeder
committed
add mkl dll through code
1 parent b88afd8 commit 6bc2b8e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

setup/setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
(r'mpl-data', [r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']),
5757
(r'mpl-data\images', glob(r'C:\Anaconda3\envs\odmtools_release\Lib\site-packages\matplotlib\mpl-data\images\*.*')),
5858
(r'mpl-data\fonts', glob(r'C:\Anaconda3\envs\odmtools_release\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')),
59-
(r'mpl-data\stylelib', glob(r'C:\Anaconda3\envs\odmtools_release\Lib\site-packages\matplotlib\mpl-data\stylelib\*.*'))]
59+
(r'mpl-data\stylelib', glob(r'C:\Anaconda3\envs\odmtools_release\Lib\site-packages\matplotlib\mpl-data\stylelib\*.*')),
6060
# ('.', glob('*.dll')),
6161
# ('.', glob('C:\Windows\system32\OPENGL32.dll'))]
62-
#('.', glob('mkl_p4m.dll')),
63-
#('.', glob('mkl_p4.dll'))]
62+
('.', glob(r'C:\Anaconda3\envs\odmtools_release\Library\bin\mkl_p4m.dll')),
63+
('.', glob(r'C:\Anaconda3\envs\odmtools_release\Library\bin\mkl_p4.dll'))]
6464

6565
OPTIONS = {
6666
#'excludes': ['_ssl', 'pyreadline', 'difflib', 'doctest', 'optparse', 'pickle', 'calendar'],
@@ -79,7 +79,8 @@
7979
"skip_archive": False,
8080
"ascii": False,
8181
"custom_boot_script": '',
82-
"packages": ['wx.lib.pubsub', 'pyodbc', 'numpy', 'scipy', 'sqlalchemy', 'wx', 'pandas', 'mkl'], #'ObjectListView',
82+
"packages": ['wx.lib.pubsub', 'pyodbc', 'numpy', 'scipy', 'sqlalchemy', 'wx', 'pandas'], #'ObjectListView',
83+
#make sure that mkl_p4.dll and mkl_p4m.dll have been copied into the Dist folder
8384
}
8485

8586

0 commit comments

Comments
 (0)