add version && link fortran.dylib in mac (#2684)

* add version && link fortran.dylib in mac

audio/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 # Use compiler ID "AppleClang" instead of "Clang" for XCode.
 # Not setting this sometimes makes XCode C compiler gets detected as "Clang",
@@ -50,9 +50,6 @@ set(THIRD_PARTY_PATH ${fc_patch})
 
 include(openblas)
 
-if (NOT PY_VERSION)
-  set(PY_VERSION 3.7)
-endif()
 set(PYBIND11_PYTHON_VERSION ${PY_VERSION})
 include(pybind)
 

audio/cmake/external/pybind.cmake

@@ -1,9 +1,12 @@
 include(FetchContent)
 include(ExternalProject)
 
+#the pybind11 is from:https://github.com/pybind/pybind11
+# Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
+
 FetchContent_Declare(
   pybind
-  URL      https://github.com/pybind/pybind11/archive/refs/tags/v2.10.0.zip
+  URL      https://paddleaudio.bj.bcebos.com/build/v2.10.0.zip
   URL_HASH SHA256=225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19
 )
 FetchContent_MakeAvailable(pybind)

audio/paddleaudio/third_party/kaldi/CMakeLists.txt

@@ -43,7 +43,7 @@ add_library(kaldi-matrix STATIC
 target_include_directories(kaldi-matrix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (NOT MSVC)
-    target_link_libraries(kaldi-matrix PUBLIC kaldi-base libopenblas ${GFORTRAN_LIBRARIES_DIR}/libgfortran.a)
+    target_link_libraries(kaldi-matrix PUBLIC kaldi-base libopenblas ${LIBGFORTRAN_LIBRARIES})
 else()
     target_link_libraries(kaldi-matrix PUBLIC kaldi-base openblas)
 endif()
@@ -108,7 +108,7 @@ add_dependencies(libkaldi kaldi-base kaldi-matrix kaldi-util kaldi-feat-common k
 target_include_directories(libkaldi INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (APPLE)
-    target_link_libraries(libkaldi INTERFACE ${KALDI_LIBRARIES} libopenblas ${GFORTRAN_LIBRARIES_DIR}/libgfortran.a)
+    target_link_libraries(libkaldi INTERFACE ${KALDI_LIBRARIES} libopenblas ${LIBGFORTRAN_LIBRARIES})
 elseif (MSVC)
     target_link_libraries(libkaldi INTERFACE kaldi-base kaldi-matrix kaldi-util kaldi-feat-common kaldi-mfcc kaldi-fbank openblas)
 else()

audio/setup.py

@@ -44,7 +44,7 @@ base = [
     "colorlog",
     "pathos == 0.2.8",
     "pybind11",
-    "Ninja",
+    "parameterized",
     "tqdm"
 ]
 
@@ -182,10 +182,18 @@ def _get_version(sha):
 
 def _make_version_file(version, sha):
     sha = "Unknown" if sha is None else sha
-    version_path = ROOT_DIR / "paddleaudio" / "version.py"
+    version_path = ROOT_DIR / "paddleaudio" / "__init__.py"
-    with open(version_path, "w") as f:
+    with open(version_path, "a") as f:
         f.write(f"__version__ = '{version}'\n")
-        f.write(f"__commit__ = '{sha}'\n")
+
+def _rm_version():
+    file_ = ROOT_DIR / "paddleaudio" / "__init__.py"
+    with open(file_, "r") as f:
+        lines = f.readlines()
+    with open(file_, "w") as f:
+        for line in lines:
+            if "__version__" not in line:
+                f.write(line)
 
 
 ################################# Steup ##################################
@@ -218,6 +226,8 @@ def main():
     print("-- Git tag:", tag)
     version = _get_version(sha)
     print("-- Building version", version)
+    _rm_version()
+
     _make_version_file(version, sha)
 
     setup_info = dict(
@@ -233,7 +243,7 @@ def main():
             "audio process"
             "paddlepaddle",
         ],
-        python_requires='>=3.7',
+        python_requires='>=3.6',
         install_requires=requirements["install"],
         extras_require={
             'develop':
@@ -260,14 +270,16 @@ def main():
             'License :: OSI Approved :: Apache Software License',
             'Programming Language :: Python',
             'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',
+            'Programming Language :: Python :: 3.10',
         ],
     )
 
     setup(**setup_info)
-
+    _rm_version()
 
 if __name__ == '__main__':
     main()