Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing 1.8.2 PR changes #38

Merged
merged 15 commits into from
May 11, 2023
Merged

Testing 1.8.2 PR changes #38

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6a7b529
Testing 1.8.2 PR changes
mmcauliffe Apr 12, 2023
15346d7
Fix patch
mmcauliffe Apr 12, 2023
d5bf258
Fix patches
mmcauliffe Apr 12, 2023
e4804b0
Add openfst dependencies
mmcauliffe Apr 12, 2023
f7ef7fa
Bump CXX_STANDARD to 17
mmcauliffe Apr 12, 2023
84e457b
Update windows build patch
mmcauliffe Apr 13, 2023
c4df726
Fix bug in patch for non-Windows
mmcauliffe Apr 13, 2023
d261482
Update tests and remove linux cuda 11.1 builds due to bug in 11.1
mmcauliffe Apr 13, 2023
9e482fd
Fix patch file
mmcauliffe Apr 13, 2023
e33e891
Simplify patch
mmcauliffe May 10, 2023
c90d4ac
Fix bug for non-Windows cuda compilation
mmcauliffe May 10, 2023
a5f7066
Fix bug in patch for non-global int32
mmcauliffe May 10, 2023
d4f900f
Add support for online bins and online dll
mmcauliffe May 11, 2023
a79eea7
Update patches
mmcauliffe May 11, 2023
f0e6d4b
Update tests
mmcauliffe May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions .ci_support/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions ..._version11fortran_compiler_version11.yaml → ..._version12fortran_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '11'
- '12'
icu:
- '72'
libblas:
Expand All @@ -33,6 +33,7 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Expand Down
40 changes: 0 additions & 40 deletions ...t/linux_64_cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...er_version9fortran_compiler_version9.yaml → ...er_version9fortran_compiler_version9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Expand Down
1 change: 1 addition & 0 deletions ..._version10fortran_compiler_version10.yaml → ..._version10fortran_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '11'
- '12'
icu:
- '72'
libblas:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '11'
- '12'
icu:
- '72'
libblas:
Expand Down
5 changes: 4 additions & 1 deletion ...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -20,5 +20,8 @@ liblapacke:
- 3.9 *netlib
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1.2'
3 changes: 3 additions & 0 deletions ...ort/win_64_cuda_compiler_version11.0.yaml → ...ompilernvcccuda_compiler_version11.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ liblapacke:
- 3.9 *netlib
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1.2'
3 changes: 3 additions & 0 deletions ...ort/win_64_cuda_compiler_version11.1.yaml → ...ompilernvcccuda_compiler_version11.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ liblapacke:
- 3.9 *netlib
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1.2'
3 changes: 3 additions & 0 deletions ...ort/win_64_cuda_compiler_version11.2.yaml → ...ompilernvcccuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ liblapacke:
- 3.9 *netlib
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1.2'
35 changes: 14 additions & 21 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/build_kaldi.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cmake -GNinja ^
-DCONDA_ROOT="%LIBRARY_PREFIX%" ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DKALDI_VERSION="%PKG_VERSION%" ^
-DBUILD_SHARED_LIBS=OFF ^
-DBUILD_SHARED_LIBS=ON ^
-DKALDI_BUILD_TEST=OFF ^
..
if %ERRORLEVEL% neq 0 exit 1
Expand Down
5 changes: 2 additions & 3 deletions recipe/build_kaldi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ for ARG in $CMAKE_ARGS; do
done
export USE_NINJA=ON

CPPFLAGS="${CPPFLAGS//-std=c++17/-std=c++14}"
CXXFLAGS="${CXXFLAGS//-std=c++17/-std=c++14}"
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"

if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then
export COMPILER_WORKS_EXITCODE=0
Expand Down Expand Up @@ -72,7 +71,7 @@ export CMAKE_BUILD_TYPE=Release
export BUILD_SHARED_LIBS=ON
export CMAKE_BUILD_WITH_INSTALL_RPATH=ON
export CMAKE_INSTALL_LIBDIR=lib
export CMAKE_CXX_STANDARD=14
export CMAKE_CXX_STANDARD=17

mkdir build

Expand Down
Loading