mirrors/kaldifeat
1
0
Fork 0
mirror of https://github.com/csukuangfj/kaldifeat.git synced 2025-08-09 01:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add alternative URLs for cmake deps (#67)

Browse Source 
* Add alternative URLs for cmake deps

* add missing files
This commit is contained in:
Fangjun Kuang 2023-03-09 15:05:27 +08:00 committed by GitHub
parent 9fdc43df23
commit bf2047023f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ project(kaldifeat)
# remember to change the version in # remember to change the version in
# scripts/conda/kaldifeat/meta.yaml # scripts/conda/kaldifeat/meta.yaml
# scripts/conda-cpu/kaldifeat/meta.yaml # scripts/conda-cpu/kaldifeat/meta.yaml
set(kaldifeat_VERSION "1.22") set(kaldifeat_VERSION "1.23")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

30
cmake/googletest.cmake
View File

@ -24,8 +24,28 @@ function(download_googltest)
include(FetchContent) include(FetchContent)
set(googletest_URL "https://github.com/google/googletest/archive/release-1.10.0.tar.gz") set(googletest_URL "https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz")
set(googletest_HASH "SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb") set(googletest_URL2 "https://huggingface.co/csukuangfj/k2-cmake-deps/resolve/main/googletest-1.13.0.tar.gz")
set(googletest_HASH "SHA256=ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363")
# If you don't have access to the Internet,
# please pre-download googletest
set(possible_file_locations
$ENV{HOME}/Downloads/googletest-1.13.0.tar.gz
${PROJECT_SOURCE_DIR}/googletest-1.13.0.tar.gz
${PROJECT_BINARY_DIR}/googletest-1.13.0.tar.gz
/tmp/googletest-1.13.0.tar.gz
/star-fj/fangjun/download/github/googletest-1.13.0.tar.gz
)
foreach(f IN LISTS possible_file_locations)
if(EXISTS ${f})
set(googletest_URL "${f}")
file(TO_CMAKE_PATH "${googletest_URL}" googletest_URL)
set(googletest_URL2)
break()
endif()
endforeach()
set(BUILD_GMOCK ON CACHE BOOL "" FORCE) set(BUILD_GMOCK ON CACHE BOOL "" FORCE)
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE) set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
@ -33,13 +53,15 @@ function(download_googltest)
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
FetchContent_Declare(googletest FetchContent_Declare(googletest
URL ${googletest_URL} URL
${googletest_URL}
${googletest_URL2}
URL_HASH ${googletest_HASH} URL_HASH ${googletest_HASH}
) )
FetchContent_GetProperties(googletest) FetchContent_GetProperties(googletest)
if(NOT googletest_POPULATED) if(NOT googletest_POPULATED)
message(STATUS "Downloading googletest") message(STATUS "Downloading googletest from ${googletest_URL}")
FetchContent_Populate(googletest) FetchContent_Populate(googletest)
endif() endif()
message(STATUS "googletest is downloaded to ${googletest_SOURCE_DIR}") message(STATUS "googletest is downloaded to ${googletest_SOURCE_DIR}")

31
cmake/pybind11.cmake
View File

@ -8,17 +8,40 @@ function(download_pybind11)
include(FetchContent) include(FetchContent)
set(pybind11_URL "https://github.com/pybind/pybind11/archive/v2.9.2.tar.gz") # latest commit as of 2022.10.31 that supports python 3.11
set(pybind11_HASH "SHA256=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1") set(pybind11_URL "https://github.com/pybind/pybind11/archive/5bc0943ed96836f46489f53961f6c438d2935357.zip")
set(pybind11_URL2 "https://huggingface.co/csukuangfj/k2-cmake-deps/resolve/main/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip")
set(pybind11_HASH "SHA256=ff65a1a8c9e6ceec11e7ed9d296f2e22a63e9ff0c4264b3af29c72b4f18f25a0")
# If you don't have access to the Internet,
# please pre-download pybind11
set(possible_file_locations
$ENV{HOME}/Downloads/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
${PROJECT_SOURCE_DIR}/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
${PROJECT_BINARY_DIR}/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
/tmp/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
/star-fj/fangjun/download/github/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
)
foreach(f IN LISTS possible_file_locations)
if(EXISTS ${f})
set(pybind11_URL "${f}")
file(TO_CMAKE_PATH "${pybind11_URL}" pybind11_URL)
set(pybind11_URL2)
break()
endif()
endforeach()
FetchContent_Declare(pybind11 FetchContent_Declare(pybind11
URL ${pybind11_URL} URL
${pybind11_URL}
${pybind11_URL2}
URL_HASH ${pybind11_HASH} URL_HASH ${pybind11_HASH}
) )
FetchContent_GetProperties(pybind11) FetchContent_GetProperties(pybind11)
if(NOT pybind11_POPULATED) if(NOT pybind11_POPULATED)
message(STATUS "Downloading pybind11") message(STATUS "Downloading pybind11 from ${pybind11_URL}")
FetchContent_Populate(pybind11) FetchContent_Populate(pybind11)
endif() endif()
message(STATUS "pybind11 is downloaded to ${pybind11_SOURCE_DIR}") message(STATUS "pybind11 is downloaded to ${pybind11_SOURCE_DIR}")

2
scripts/conda-cpu/kaldifeat/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: kaldifeat name: kaldifeat
version: "1.22" version: "1.23"
source: source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

2
scripts/conda/kaldifeat/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: kaldifeat name: kaldifeat
version: "1.22" version: "1.23"
source: source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"