Improved darwin support

Author: Pavel Sukhachev

Compiler/Compilers/Compiler.py

@@ -52,13 +52,15 @@ def setupPlatform(forPython):
 				libraryDirs = [os.path.join(bindir, "libs"), bindir]
 				libraries = ["python%s%s" % sys.version_info[:2]]
 
-		elif sys.platform == "linux":
-			oext, libext, soext = ".o", ".a", ".so"
+		elif sys.platform in ("linux", "darwin"):
+			oext, libext, soext = ".o", ".a", (".so" if sys.platform == "linux" else ".dylib")
 			linkext, debugext = [], []
 
 			if forPython:
 				libraryDirs = [config["LIBDIR"]]
-				libraries = ["python%s.%sm" % sys.version_info[:2]]
+
+				(major, minor), mext = sys.version_info[:2], "m" if sys.platform == "linux" else ""
+				libraries = ["python%s.%s%s" % (major, minor, mext)]
 
 		else:
 			raise NotImplementedError(sys.platform)

Intel/ThirdParty/finddnnl.py

@@ -9,7 +9,7 @@ def findDNNL():
 		libnames += ["/usr/local/lib/%s" % libname for libname in libnames]
 
 	elif sys.platform == "darwin":
-		libnames = ["libdnnl.%s.dylib" % v for v in versions]
+		libnames = ["/usr/local/lib/libdnnl.%s.dylib" % v for v in versions]
 
 	elif sys.platform == "win32":
 		libpaths = [
@@ -32,6 +32,6 @@ def findDNNL():
 			pass
 
 		else:
-			return clib
+			return libname, clib
 
 	raise OSError("dnnl library not found (searched for following version(s): %s)" % versions)

Intel/ThirdParty/libdnnl.py

@@ -2,7 +2,7 @@
 from PuzzleLib.Intel.ThirdParty.finddnnl import findDNNL
 
 
-_libdnnl = findDNNL()
+_, _libdnnl = findDNNL()
 
 
 class dnnlError(Exception):

setup.py

@@ -239,7 +239,7 @@ def installIntelPackage(src, dst, options):
 		from PuzzleLib.Intel.ThirdParty.finddnnl import findDNNL
 
 		print("\nChecking dnnl installation ...")
-		lib = findDNNL()
+		lib, _ = findDNNL();
 
 		if os.path.commonpath([dst, lib]) == dst:
 			data = {pathToPackageName(dst): [lib]}