From 49d8e0b420b7056e0b5f5c36f5c10b8526f542e2 Mon Sep 17 00:00:00 2001 From: Bob Lannon Date: Fri, 16 Mar 2018 13:58:14 -0400 Subject: [PATCH 1/3] adding mason-installed lib and include dirs --- setup.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/setup.py b/setup.py index 056816d..b268309 100644 --- a/setup.py +++ b/setup.py @@ -19,20 +19,39 @@ from setuptools import Extension from setuptools import setup +import os + +PROJ_DIR = os.path.dirname(os.path.realpath(__file__)) + + COMPILE_ARGS = ["-std=c++11", "-Wno-unused-function", "-Wno-unused-local-typedef", "-funsigned-char"] +INCLUDE_DIRS = [os.path.join(PROJ_DIR, p) for p in [ + "mason_packages/osx-x86_64/openfst/1.6.7/include", + "mason_packages/osx-x86_64/re2/2017-08-01/include/re2", +]] + +LIBRARY_DIRS = [os.path.join(PROJ_DIR, p) for p in [ + "mason_packages/osx-x86_64/openfst/1.6.7/lib", + "mason_packages/osx-x86_64/re2/2017-08-01/lib", +]] + pywrapfst = Extension(name="pywrapfst", language="c++", extra_compile_args=COMPILE_ARGS, + library_dirs=LIBRARY_DIRS, + include_dirs=INCLUDE_DIRS, libraries=["fstfarscript", "fstfar", "fstscript", "fst", "m", "dl"], sources=["src/pywrapfst.cc"]) pynini = Extension(name="pynini", language="c++", extra_compile_args=COMPILE_ARGS, + library_dirs=LIBRARY_DIRS, + include_dirs=INCLUDE_DIRS, libraries=["re2", "fstfarscript", "fstpdtscript", From c367de7ee05b1a565c759818122c389a78a0286d Mon Sep 17 00:00:00 2001 From: Bob Lannon Date: Thu, 22 Mar 2018 17:21:40 +0000 Subject: [PATCH 2/3] detect platform --- setup.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index b268309..199a46d 100644 --- a/setup.py +++ b/setup.py @@ -20,24 +20,28 @@ from setuptools import setup import os +import platform PROJ_DIR = os.path.dirname(os.path.realpath(__file__)) - +if platform.system() == 'Linux': + OS='linux' +elif platform.system() == 'Darwin': + OS='osx' COMPILE_ARGS = ["-std=c++11", "-Wno-unused-function", "-Wno-unused-local-typedef", "-funsigned-char"] -INCLUDE_DIRS = [os.path.join(PROJ_DIR, p) for p in [ - "mason_packages/osx-x86_64/openfst/1.6.7/include", - "mason_packages/osx-x86_64/re2/2017-08-01/include/re2", +INCLUDE_DIRS = [os.path.join(PROJ_DIR, p).format(OS) for p in [ + "mason_packages/{}-x86_64/openfst/1.6.7/include", + "mason_packages/{}-x86_64/re2/2017-08-01/include", ]] -LIBRARY_DIRS = [os.path.join(PROJ_DIR, p) for p in [ - "mason_packages/osx-x86_64/openfst/1.6.7/lib", - "mason_packages/osx-x86_64/re2/2017-08-01/lib", +LIBRARY_DIRS = [os.path.join(PROJ_DIR, p).format(OS) for p in [ + "mason_packages/{}-x86_64/openfst/1.6.7/lib", + "mason_packages/{}-x86_64/re2/2017-08-01/lib", ]] pywrapfst = Extension(name="pywrapfst", language="c++", From b566112529235319cfb5bd6b290824196baf8e21 Mon Sep 17 00:00:00 2001 From: Bob Lannon Date: Wed, 4 Apr 2018 16:09:36 -0400 Subject: [PATCH 3/3] use dynamiclib in ldshared --- pynini.egg-info/PKG-INFO | 1 + pynini.egg-info/SOURCES.txt | 1 + setup.py | 3 +++ 3 files changed, 5 insertions(+) diff --git a/pynini.egg-info/PKG-INFO b/pynini.egg-info/PKG-INFO index 314faa0..40e09f1 100644 --- a/pynini.egg-info/PKG-INFO +++ b/pynini.egg-info/PKG-INFO @@ -6,6 +6,7 @@ Home-page: http://pynini.opengrm.org/ Author: Kyle Gorman Author-email: kbg@google.com License: UNKNOWN +Description-Content-Type: UNKNOWN Description: UNKNOWN Keywords: natural language processing,speech recognition,machine learning Platform: UNKNOWN diff --git a/pynini.egg-info/SOURCES.txt b/pynini.egg-info/SOURCES.txt index 37f146e..f2f6727 100644 --- a/pynini.egg-info/SOURCES.txt +++ b/pynini.egg-info/SOURCES.txt @@ -7,6 +7,7 @@ NEWS README.rst pynini.pdf pynini_test.py +setup.cfg setup.py pynini.egg-info/PKG-INFO pynini.egg-info/SOURCES.txt diff --git a/setup.py b/setup.py index 199a46d..de38cb9 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,9 @@ OS='linux' elif platform.system() == 'Darwin': OS='osx' + from distutils import sysconfig + config_vars = sysconfig.get_config_vars() + config_vars['LDSHARED'] = config_vars['LDSHARED'].replace('-bundle', '-dynamiclib') COMPILE_ARGS = ["-std=c++11", "-Wno-unused-function",