Skip to content

add asound for linux. fix deprecated torch type. #254

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

Merged
merged 3 commits into from
Aug 29, 2019
Merged

add asound for linux. fix deprecated torch type. #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c58cbd4
fix deprecated torch type.
Mistobaan Aug 22, 2019
e1ecbf5
don't link alsa on linux.
Mistobaan Aug 22, 2019
81b2657
Merge branch 'master' into master
vincentqb Aug 29, 2019
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
2 changes: 1 addition & 1 deletion packaging/build_from_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pushd sox-14.4.2
./configure --disable-shared --enable-static --prefix="$PREFIX/third_party/sox" \
LDFLAGS="-L$PREFIX/third_party/lame/lib -L$PREFIX/third_party/flac/lib -L$PREFIX/third_party/mad/lib" \
CPPFLAGS="-I$PREFIX/third_party/lame/include -I$PREFIX/third_party/flac/include -I$PREFIX/third_party/mad/include" \
--with-lame --with-flac --with-mad --without-coreaudio --without-png --without-oggvorbis --without-oss --without-sndfile CFLAGS=-fPIC CXXFLAGS=-fPIC --with-pic --disable-debug --disable-dependency-tracking
--with-lame --with-flac --with-mad --without-alsa --without-coreaudio --without-png --without-oggvorbis --without-oss --without-sndfile CFLAGS=-fPIC CXXFLAGS=-fPIC --with-pic --disable-debug --disable-dependency-tracking
make -s -j && make install
popd

Expand Down
6 changes: 3 additions & 3 deletions torchaudio/torch_sox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct SoxDescriptor {
int64_t write_audio(SoxDescriptor& fd, at::Tensor tensor) {
std::vector<sox_sample_t> buffer(tensor.numel());

AT_DISPATCH_ALL_TYPES(tensor.type(), "write_audio_buffer", [&] {
AT_DISPATCH_ALL_TYPES(tensor.scalar_type(), "write_audio_buffer", [&] {
auto* data = tensor.data_ptr<scalar_t>();
std::copy(data, data + tensor.numel(), buffer.begin());
});
Expand All @@ -63,7 +63,7 @@ void read_audio(
output.resize_({samples_read / number_of_channels, number_of_channels});
output = output.contiguous();

AT_DISPATCH_ALL_TYPES(output.type(), "read_audio_buffer", [&] {
AT_DISPATCH_ALL_TYPES(output.scalar_type(), "read_audio_buffer", [&] {
auto* data = output.data_ptr<scalar_t>();
std::copy(buffer.begin(), buffer.begin() + samples_read, data);
});
Expand Down Expand Up @@ -369,7 +369,7 @@ int build_flow_effects(const std::string& file_name,
std::vector<sox_sample_t> samples(buffer_size);
const int64_t samples_read = sox_read(input, samples.data(), buffer_size);
assert(samples_read != nc * ns && samples_read != 0);
AT_DISPATCH_ALL_TYPES(otensor.type(), "effects_buffer", [&] {
AT_DISPATCH_ALL_TYPES(otensor.scalar_type(), "effects_buffer", [&] {
auto* data = otensor.data_ptr<scalar_t>();
std::copy(samples.begin(), samples.begin() + samples_read, data);
});
Expand Down