Skip to content

Commit e75732f

Browse files
author
Caroline Chen
committed
Resolve build warnings
1 parent 29af434 commit e75732f

File tree

6 files changed

+37
-44
lines changed

6 files changed

+37
-44
lines changed

‎torchaudio/csrc/rnnt/cpu/compute.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,34 @@ std::tuple<torch::Tensor, c10::optional<torch::Tensor>> compute(
5454

5555
Workspace<float> workspace(
5656
/*options=*/options,
57-
/*dtype_data=*/float_workspace.data<float>(),
57+
/*dtype_data=*/float_workspace.data_ptr<float>(),
5858
/*dtype_size=*/float_workspace.numel(),
59-
/*int_data=*/int_workspace.data<int>(),
59+
/*int_data=*/int_workspace.data_ptr<int>(),
6060
/*int_size=*/int_workspace.numel());
6161

62-
switch (logits.type().scalarType()) {
62+
switch (logits.scalar_type()) {
6363
case torch::ScalarType::Float: {
6464
Compute</*DTYPE=*/float, /*CAST_DTYPE=*/float>(
6565
/*workspace=*/workspace,
66-
/*logits=*/logits.data<float>(),
67-
/*targets=*/targets.data<int>(),
68-
/*src_lengths=*/src_lengths.data<int>(),
69-
/*tgt_lengths=*/tgt_lengths.data<int>(),
70-
/*costs=*/costs.data<float>(),
66+
/*logits=*/logits.data_ptr<float>(),
67+
/*targets=*/targets.data_ptr<int>(),
68+
/*src_lengths=*/src_lengths.data_ptr<int>(),
69+
/*tgt_lengths=*/tgt_lengths.data_ptr<int>(),
70+
/*costs=*/costs.data_ptr<float>(),
7171
/*gradients=*/
72-
(gradients == c10::nullopt) ? nullptr : gradients->data<float>());
72+
(gradients == c10::nullopt) ? nullptr : gradients->data_ptr<float>());
7373
break;
7474
}
7575
case torch::ScalarType::Half: {
7676
Compute</*DTYPE=*/c10::Half, /*CAST_DTYPE=*/float>(
7777
/*workspace=*/workspace,
78-
/*logits=*/logits.data<c10::Half>(),
79-
/*targets=*/targets.data<int>(),
80-
/*src_lengths=*/src_lengths.data<int>(),
81-
/*tgt_lengths=*/tgt_lengths.data<int>(),
82-
/*costs=*/costs.data<c10::Half>(),
78+
/*logits=*/logits.data_ptr<c10::Half>(),
79+
/*targets=*/targets.data_ptr<int>(),
80+
/*src_lengths=*/src_lengths.data_ptr<int>(),
81+
/*tgt_lengths=*/tgt_lengths.data_ptr<int>(),
82+
/*costs=*/costs.data_ptr<c10::Half>(),
8383
/*gradients=*/
84-
(gradients == c10::nullopt) ? nullptr : gradients->data<c10::Half>());
84+
(gradients == c10::nullopt) ? nullptr : gradients->data_ptr<c10::Half>());
8585
break;
8686
}
8787
default: {

‎torchaudio/csrc/rnnt/cpu/compute_alphas.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ torch::Tensor compute_alphas(
4444

4545
Workspace<float> workspace(
4646
/*options=*/options,
47-
/*dtype_data=*/float_workspace.data<float>(),
47+
/*dtype_data=*/float_workspace.data_ptr<float>(),
4848
/*dtype_size=*/float_workspace.numel(),
49-
/*int_data=*/int_workspace.data<int>(),
49+
/*int_data=*/int_workspace.data_ptr<int>(),
5050
/*int_size=*/int_workspace.numel());
5151

5252
// Only support float, this is mainly to enable easy
5353
// unit-testing
5454
ComputeAlphas</*DTYPE=*/float, /*CAST_DTYPE=*/float>(
5555
/*workspace=*/workspace,
56-
/*logits=*/logits.data<float>(),
57-
/*targets=*/targets.data<int>(),
58-
/*src_lengths=*/src_lengths.data<int>(),
59-
/*tgt_lengths=*/tgt_lengths.data<int>(),
60-
/*alphas=*/alphas.data<float>());
56+
/*logits=*/logits.data_ptr<float>(),
57+
/*targets=*/targets.data_ptr<int>(),
58+
/*src_lengths=*/src_lengths.data_ptr<int>(),
59+
/*tgt_lengths=*/tgt_lengths.data_ptr<int>(),
60+
/*alphas=*/alphas.data_ptr<float>());
6161
return alphas;
6262
}
6363

‎torchaudio/csrc/rnnt/cpu/compute_betas.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ torch::Tensor compute_betas(
4848

4949
Workspace<float> workspace(
5050
/*options=*/options,
51-
/*dtype_data=*/float_workspace.data<float>(),
51+
/*dtype_data=*/float_workspace.data_ptr<float>(),
5252
/*dtype_size=*/float_workspace.numel(),
53-
/*int_data=*/int_workspace.data<int>(),
53+
/*int_data=*/int_workspace.data_ptr<int>(),
5454
/*int_size=*/int_workspace.numel());
5555

5656
// Only support float, this is mainly to enable easy
5757
// unit-testing
5858
ComputeBetas</*DTYPE=*/float, /*CAST_DTYPE=*/float>(
5959
/*workspace=*/workspace,
60-
/*logits=*/logits.data<float>(),
61-
/*targets=*/targets.data<int>(),
62-
/*src_lengths=*/src_lengths.data<int>(),
63-
/*tgt_lengths=*/tgt_lengths.data<int>(),
64-
/*costs=*/costs.data<float>(),
65-
/*betas=*/betas.data<float>());
60+
/*logits=*/logits.data_ptr<float>(),
61+
/*targets=*/targets.data_ptr<int>(),
62+
/*src_lengths=*/src_lengths.data_ptr<int>(),
63+
/*tgt_lengths=*/tgt_lengths.data_ptr<int>(),
64+
/*costs=*/costs.data_ptr<float>(),
65+
/*betas=*/betas.data_ptr<float>());
6666
return betas;
6767
}
6868

‎torchaudio/csrc/rnnt/cpu/cpu_transducer.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ status_t Compute(
3636
const int& D = options.numTargets_;
3737

3838
{ // compute denominators.
39-
status_t status = LogSumExp2D<DTYPE, CAST_DTYPE>(
39+
LogSumExp2D<DTYPE, CAST_DTYPE>(
4040
/*N=*/B * maxT * maxU,
4141
/*D=*/D,
4242
/*logits=*/logits,
4343
/*denominators=*/workspace.GetPointerToDenominators());
4444
}
4545

4646
{ // compute log prob pairs.
47-
status_t status = ComputeLogProbs<DTYPE, CAST_DTYPE>(
47+
ComputeLogProbs<DTYPE, CAST_DTYPE>(
4848
/*options=*/options,
4949
/*logits=*/logits,
5050
/*targets=*/targets,
@@ -99,15 +99,15 @@ status_t ComputeAlphas(
9999
const int& D = options.numTargets_;
100100

101101
{ // compute denominators.
102-
status_t status = LogSumExp2D<DTYPE, CAST_DTYPE>(
102+
LogSumExp2D<DTYPE, CAST_DTYPE>(
103103
/*N=*/B * maxT * maxU,
104104
/*D=*/D,
105105
/*logits=*/logits,
106106
/*denominators=*/workspace.GetPointerToDenominators());
107107
}
108108

109109
{ // compute log prob pairs.
110-
status_t status = ComputeLogProbs<DTYPE, CAST_DTYPE>(
110+
ComputeLogProbs<DTYPE, CAST_DTYPE>(
111111
/*options=*/options,
112112
/*logits=*/logits,
113113
/*targets=*/targets,
@@ -148,15 +148,15 @@ status_t ComputeBetas(
148148
const int& D = options.numTargets_;
149149

150150
{ // compute denominators.
151-
status_t status = LogSumExp2D<DTYPE, CAST_DTYPE>(
151+
LogSumExp2D<DTYPE, CAST_DTYPE>(
152152
/*N=*/B * maxT * maxU,
153153
/*D=*/D,
154154
/*logits=*/logits,
155155
/*denominators=*/workspace.GetPointerToDenominators());
156156
}
157157

158158
{ // compute log prob pairs.
159-
status_t status = ComputeLogProbs<DTYPE, CAST_DTYPE>(
159+
ComputeLogProbs<DTYPE, CAST_DTYPE>(
160160
/*options=*/options,
161161
/*logits=*/logits,
162162
/*targets=*/targets,

‎torchaudio/csrc/rnnt/macros.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,3 @@
1919
typedef enum { INFO = 0, WARNING = 1, ERROR = 2, FATAL = 3 } level_t;
2020

2121
const char* ToString(level_t level);
22-
23-
#define DCHECK(x)
24-
#define DCHECK_EQ(x, y)
25-
#define DCHECK_NE(x, y)
26-
#define CHECK(x)
27-
#define CHECK_EQ(x, y)
28-
#define CHECK_NE(x, y)

‎torchaudio/csrc/rnnt/workspace.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class IntWorkspace {
9898

9999
void Reset(const Options& options, int* data, int size) {
100100
int needed_size = ComputeSizeFromOptions(options);
101-
// CHECK_LE(needed_size, size);
101+
CHECK_LE(needed_size, size);
102102
options_ = options;
103103
data_ = data;
104104
size_ = size;

0 commit comments

Comments
 (0)