Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kamo-naoyuki committed May 12, 2022
1 parent b98fc86 commit d234b9a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 1 addition & 7 deletions tools/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# PyTorch version: 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.0, 1.10.1 and 1.11.0 are tested.
TH_VERSION := 1.10.1
TH_VERSION := 1.11.0

# Use pip for pytorch installation even if you have anaconda
ifneq ($(shell test -f ./activate_python.sh && grep 'conda activate' ./activate_python.sh),)
Expand Down Expand Up @@ -28,14 +28,8 @@ endif

all: kaldi showenv python conda_packages.done sctk.done sph2pipe.done check_install

ifneq ($(strip $(CHAINER_VERSION)),)
python: activate_python.sh espnet.done pytorch.done chainer.done fairscale.done torch_optimizer.done
extra: warp-ctc.done warp-transducer.done chainer_ctc.done nkf.done moses.done mwerSegmenter.done pesq kenlm.done pyopenjtalk.done py3mmseg.done beamformit.done fairseq.done s3prl.done k2.done transformers.done phonemizer.done longformer.done
else
python: activate_python.sh espnet.done pytorch.done fairscale.done torch_optimizer.done
extra: warp-ctc.done warp-transducer.done nkf.done moses.done mwerSegmenter.done pesq kenlm.done pyopenjtalk.done py3mmseg.done beamformit.done fairseq.done s3prl.done k2.done transformers.done phonemizer.done longformer.done
endif


kaldi:
test -f kaldi/egs/wsj/s5/utils/parse_options.sh || git clone --depth 1 https://github.com/kaldi-asr/kaldi
Expand Down
6 changes: 6 additions & 0 deletions tools/installers/install_torch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ install_torch(){
if [ -z "${cuda_version}" ]; then
log conda install -y "pytorch=${torch_version}" "torchaudio=$1" cpuonly -c pytorch
conda install -y "pytorch=${torch_version}" "torchaudio=$1" cpuonly -c pytorch
elif [ "${cuda_version}" = "11.5" ]; then
# NOTE(kamo): In my environment, conda-forge only could installed, but I don't know why @ 12, May, 2022
cudatoolkit_channel=conda-forge
log conda install -y "pytorch=${torch_version}" "torchaudio=$1" "cudatoolkit=${cuda_version}" -c pytorch -c "${cudatoolkit_channel}"
conda install -y "pytorch=${torch_version}" "torchaudio=$1" "cudatoolkit=${cuda_version}" -c pytorch -c "${cudatoolkit_channel}"

elif [ "${cuda_version}" = "11.1" ] || [ "${cuda_version}" = "11.2" ]; then
# Anaconda channel, which is default main channel, doesn't provide cudatoolkit=11.1, 11.2 now (Any pytorch version doesn't provide cuda=11.2).
# https://anaconda.org/anaconda/cudatoolkit/files
Expand Down

0 comments on commit d234b9a

Please sign in to comment.