Skip to content

Commit 91ce3e3

Browse files
narendasannarendasan
authored
Merge pull request #370 from developer0hye/safe-shared-pointer
more safe and easily readable use to get raw pointer of shared-pointer
2 parents 5b6bd4c + db675a6 commit 91ce3e3

27 files changed

+116
-116
lines changed

‎tests/core/conversion/converters/test_activation.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TEST(Converters, ATenReLUConvertsCorrectly) {
1111
return (%3))IR";
1212

1313
auto g = std::make_shared<torch::jit::Graph>();
14-
torch::jit::parseIR(graph, &*g);
14+
torch::jit::parseIR(graph, g.get());
1515

1616
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
1717
auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
@@ -31,7 +31,7 @@ TEST(Converters, ATenSigmoidConvertsCorrectly) {
3131
return (%3))IR";
3232

3333
auto g = std::make_shared<torch::jit::Graph>();
34-
torch::jit::parseIR(graph, &*g);
34+
torch::jit::parseIR(graph, g.get());
3535

3636
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
3737
auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
@@ -51,7 +51,7 @@ TEST(Converters, ATenTanhConvertsCorrectly) {
5151
return (%3))IR";
5252

5353
auto g = std::make_shared<torch::jit::Graph>();
54-
torch::jit::parseIR(graph, &*g);
54+
torch::jit::parseIR(graph, g.get());
5555

5656
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
5757
auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
@@ -75,7 +75,7 @@ TEST(Converters, ATenTanhConvertsCorrectly) {
7575
// return (%3))IR";
7676

7777
// auto g = std::make_shared<torch::jit::Graph>();
78-
// torch::jit::script::parseIR(graph, &*g);
78+
// torch::jit::script::parseIR(graph, g.get());
7979

8080
// auto in = at::randint(-5, 5, {5}, {at::kCUDA});
8181
// auto params = trtorch::core::conversion::get_named_params(g->inputs(),
@@ -98,7 +98,7 @@ TEST(Converters, ATenHardTanhCustomRangeConvertsCorrectly) {
9898
return (%3))IR";
9999

100100
auto g = std::make_shared<torch::jit::Graph>();
101-
torch::jit::parseIR(graph, &*g);
101+
torch::jit::parseIR(graph, g.get());
102102

103103
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
104104
auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
@@ -119,7 +119,7 @@ TEST(Converters, ATenPReLUConvertsCorrectly) {
119119
return (%3))IR";
120120

121121
auto g = std::make_shared<torch::jit::Graph>();
122-
torch::jit::parseIR(graph, &*g);
122+
torch::jit::parseIR(graph, g.get());
123123

124124
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
125125
auto slope = at::randint(-5, 5, {1}, {at::kCUDA});
@@ -142,7 +142,7 @@ TEST(Converters, ATenPReLUMultiChannelConvertsCorrectly) {
142142
return (%3))IR";
143143

144144
auto g = std::make_shared<torch::jit::Graph>();
145-
torch::jit::parseIR(graph, &*g);
145+
torch::jit::parseIR(graph, g.get());
146146

147147
auto in = at::randint(-5, 5, {1, 10, 1, 1}, {at::kCUDA});
148148
auto slope = at::randint(-5, 5, {10}, {at::kCUDA});
@@ -165,7 +165,7 @@ TEST(Converters, ATenLeakyReluConvertsCorrectly) {
165165
return (%2))IR";
166166

167167
auto g = std::make_shared<torch::jit::Graph>();
168-
torch::jit::parseIR(graph, &*g);
168+
torch::jit::parseIR(graph, g.get());
169169

170170
auto in = at::randint(-5, 5, {5}, {at::kCUDA});
171171
auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
@@ -187,7 +187,7 @@ TEST(Converters, ATenEluConvertsCorrectly) {
187187
return (%result.2))IR";
188188

189189
auto g = std::make_shared<torch::jit::Graph>();
190-
torch::jit::parseIR(graph, &*g);
190+
torch::jit::parseIR(graph, g.get());
191191

192192
auto in = at::randint(-5, 5, {1, 10, 1, 1}, {at::kCUDA});
193193

‎tests/core/conversion/converters/test_batch_norm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TEST(Converters, ATenBatchNormConvertsCorrectly) {
1818
return (%8))IR";
1919

2020
auto g = std::make_shared<torch::jit::Graph>();
21-
torch::jit::parseIR(graph, &*g);
21+
torch::jit::parseIR(graph, g.get());
2222

2323
auto in = at::randint(1, 10, {1, 5, 5, 5}, {at::kCUDA});
2424
auto gamma = at::randint(1, 10, {5}, {at::kCUDA});

‎tests/core/conversion/converters/test_concat.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TEST(Converters, ATenCatPureTensorConvertsCorrectly) {
1414
return (%4))IR";
1515

1616
auto g = std::make_shared<torch::jit::Graph>();
17-
torch::jit::parseIR(graph, &*g);
17+
torch::jit::parseIR(graph, g.get());
1818

1919
auto in1 = at::randint(1, 10, {5}, {at::kCUDA});
2020
auto in2 = at::randint(1, 10, {5}, {at::kCUDA});
@@ -38,7 +38,7 @@ TEST(Converters, ATenCatDiffTensorConvertsCorrectly) {
3838
return (%4))IR";
3939

4040
auto g = std::make_shared<torch::jit::Graph>();
41-
torch::jit::parseIR(graph, &*g);
41+
torch::jit::parseIR(graph, g.get());
4242

4343
auto in1 = at::randint(1, 10, {5}, {at::kCUDA});
4444
auto in2 = at::randint(1, 10, {5}, {at::kCUDA});

‎tests/core/conversion/converters/test_conv_deconv.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
void conv_test_helper(std::string graph_ir) {
1414
auto g = std::make_shared<torch::jit::Graph>();
15-
torch::jit::parseIR(graph_ir, &*g);
15+
torch::jit::parseIR(graph_ir, g.get());
1616

1717
auto in = at::randint(1, 10, {1, 3, 10, 10}, {at::kCUDA});
1818
auto w = at::randint(1, 10, {8, 3, 5, 5}, {at::kCUDA});
@@ -54,7 +54,7 @@ TEST(Converters, ATenConvolutionConvertsCorrectly) {
5454
return (%12))IR";
5555

5656
auto g = std::make_shared<torch::jit::Graph>();
57-
torch::jit::parseIR(graph, &*g);
57+
torch::jit::parseIR(graph, g.get());
5858

5959
auto in = at::randint(1, 10, {1, 3, 10, 10}, {at::kCUDA});
6060
auto w = at::randint(1, 10, {8, 3, 5, 5}, {at::kCUDA});
@@ -96,7 +96,7 @@ TEST(Converters, ATenConvolutionNoBiasConvertsCorrectly) {
9696
return (%12))IR";
9797

9898
auto g = std::make_shared<torch::jit::Graph>();
99-
torch::jit::parseIR(graph, &*g);
99+
torch::jit::parseIR(graph, g.get());
100100

101101
auto in = at::randint(1, 2, {1, 1, 3, 3}, {at::kCUDA});
102102
auto w = at::randint(1, 2, {4, 1, 2, 2}, {at::kCUDA});
@@ -135,7 +135,7 @@ TEST(Converters, ATenConvolutionWithStrideConvertsCorrectly) {
135135
return (%13))IR";
136136

137137
auto g = std::make_shared<torch::jit::Graph>();
138-
torch::jit::parseIR(graph, &*g);
138+
torch::jit::parseIR(graph, g.get());
139139

140140
auto in = at::randint(1, 10, {1, 3, 9, 9}, {at::kCUDA});
141141
auto w = at::randint(1, 10, {4, 3, 3, 3}, {at::kCUDA});
@@ -178,7 +178,7 @@ TEST(Converters, ATenConvolutionWithPaddingConvertsCorrectly) {
178178
return (%13))IR";
179179

180180
auto g = std::make_shared<torch::jit::Graph>();
181-
torch::jit::parseIR(graph, &*g);
181+
torch::jit::parseIR(graph, g.get());
182182

183183
auto in = at::randint(1, 10, {1, 3, 4, 4}, {at::kCUDA});
184184
auto w = at::randint(1, 10, {4, 3, 2, 2}, {at::kCUDA});
@@ -220,7 +220,7 @@ TEST(Converters, ATenConvolution3dConvertsCorrectly) {
220220
return (%out))IR";
221221

222222
auto g = std::make_shared<torch::jit::Graph>();
223-
torch::jit::parseIR(graph, &*g);
223+
torch::jit::parseIR(graph, g.get());
224224

225225
auto in = at::randint(1, 10, {1, 3, 5, 5, 5}, {at::kCUDA});
226226
auto w = at::randint(1, 10, {32, 3, 3, 3, 3}, {at::kCUDA});
@@ -262,7 +262,7 @@ TEST(Converters, ATenConvolution3dNoBiasConvertsCorrectly) {
262262
return (%out))IR";
263263

264264
auto g = std::make_shared<torch::jit::Graph>();
265-
torch::jit::parseIR(graph, &*g);
265+
torch::jit::parseIR(graph, g.get());
266266

267267
auto in = at::randint(1, 2, {1, 3, 5, 5, 5}, {at::kCUDA});
268268
auto w = at::randint(1, 2, {32, 3, 3, 3, 3}, {at::kCUDA});
@@ -300,7 +300,7 @@ TEST(Converters, ATenConvolution3dWithPaddingConvertsCorrectly) {
300300
return (%out))IR";
301301

302302
auto g = std::make_shared<torch::jit::Graph>();
303-
torch::jit::parseIR(graph, &*g);
303+
torch::jit::parseIR(graph, g.get());
304304

305305
auto in = at::randint(1, 10, {1, 3, 5, 5, 5}, {at::kCUDA});
306306
auto w = at::randint(1, 10, {32, 3, 3, 3, 3}, {at::kCUDA});
@@ -342,7 +342,7 @@ TEST(Converters, ATenConvolution3dWithStrideDilationConvertsCorrectly) {
342342
return (%out))IR";
343343

344344
auto g = std::make_shared<torch::jit::Graph>();
345-
torch::jit::parseIR(graph, &*g);
345+
torch::jit::parseIR(graph, g.get());
346346

347347
auto in = at::randint(1, 10, {1, 3, 5, 5, 5}, {at::kCUDA});
348348
auto w = at::randint(1, 10, {32, 3, 3, 3, 3}, {at::kCUDA});
@@ -384,7 +384,7 @@ TEST(Converters, ATenConvTransposeConvertsCorrectly) {
384384
return (%12))IR";
385385

386386
auto g = std::make_shared<torch::jit::Graph>();
387-
torch::jit::parseIR(graph, &*g);
387+
torch::jit::parseIR(graph, g.get());
388388

389389
auto in = at::randint(1, 3, {1, 8, 5, 5}, {at::kCUDA});
390390
auto w = at::randint(1, 3, {8, 3, 3, 3}, {at::kCUDA});
@@ -426,7 +426,7 @@ TEST(Converters, ATenConvTransposeNoBiasConvertsCorrectly) {
426426
return (%12))IR";
427427

428428
auto g = std::make_shared<torch::jit::Graph>();
429-
torch::jit::parseIR(graph, &*g);
429+
torch::jit::parseIR(graph, g.get());
430430

431431
auto in = at::randint(1, 2, {1, 4, 3, 3}, {at::kCUDA});
432432
auto w = at::randint(1, 2, {4, 1, 2, 2}, {at::kCUDA});
@@ -465,7 +465,7 @@ TEST(Converters, ATenConvTransposeWithStrideConvertsCorrectly) {
465465
return (%13))IR";
466466

467467
auto g = std::make_shared<torch::jit::Graph>();
468-
torch::jit::parseIR(graph, &*g);
468+
torch::jit::parseIR(graph, g.get());
469469

470470
auto in = at::randint(1, 10, {1, 4, 9, 9}, {at::kCUDA});
471471
auto w = at::randint(1, 10, {4, 3, 3, 3}, {at::kCUDA});
@@ -508,7 +508,7 @@ TEST(Converters, ATenConvTransposeWithPaddingConvertsCorrectly) {
508508
return (%13))IR";
509509

510510
auto g = std::make_shared<torch::jit::Graph>();
511-
torch::jit::parseIR(graph, &*g);
511+
torch::jit::parseIR(graph, g.get());
512512

513513
auto in = at::randint(1, 10, {1, 4, 4, 4}, {at::kCUDA});
514514
auto w = at::randint(1, 10, {4, 3, 2, 2}, {at::kCUDA});
@@ -551,7 +551,7 @@ TEST(Converters, ATenConvolutionWithGroupConvertsCorrectly) {
551551
return (%13))IR";
552552

553553
auto g = std::make_shared<torch::jit::Graph>();
554-
torch::jit::parseIR(graph, &*g);
554+
torch::jit::parseIR(graph, g.get());
555555

556556
auto in = at::randint(1, 10, {1, 4, 4, 4}, {at::kCUDA});
557557
auto w = at::randint(1, 10, {8, 1, 2, 2}, {at::kCUDA});
@@ -594,7 +594,7 @@ TEST(Converters, ATenConvTransposeWithGroupConvertsCorrectly) {
594594
return (%13))IR";
595595

596596
auto g = std::make_shared<torch::jit::Graph>();
597-
torch::jit::parseIR(graph, &*g);
597+
torch::jit::parseIR(graph, g.get());
598598

599599
auto in = at::randint(1, 10, {1, 8, 5, 5}, {at::kCUDA});
600600
auto w = at::randint(1, 10, {8, 4, 3, 3}, {at::kCUDA});

‎tests/core/conversion/converters/test_element_wise.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void pointwise_test_helper(
1111
std::vector<int64_t> shape1 = {5},
1212
std::vector<int64_t> shape2 = {5}) {
1313
auto g = std::make_shared<torch::jit::Graph>();
14-
torch::jit::parseIR(graph_ir, &*g);
14+
torch::jit::parseIR(graph_ir, g.get());
1515

1616
// singleInput case is enabled when elementwise operation is performed
1717
// with an input and a constant embedded in graph

‎tests/core/conversion/converters/test_expand.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TEST(Converters, ATenExpandSameDimConvertsCorrectly) {
1515

1616
auto g = std::make_shared<torch::jit::Graph>();
1717

18-
torch::jit::parseIR(graph, &*g);
18+
torch::jit::parseIR(graph, g.get());
1919

2020
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
2121

@@ -42,7 +42,7 @@ TEST(Converters, ATenExpandSameDimConvertsCorrectlyWithDynamicInput) {
4242

4343
auto g = std::make_shared<torch::jit::Graph>();
4444

45-
torch::jit::parseIR(graph, &*g);
45+
torch::jit::parseIR(graph, g.get());
4646

4747
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
4848

@@ -69,7 +69,7 @@ TEST(Converters, ATenExpandTileConvertsCorrectly) {
6969

7070
auto g = std::make_shared<torch::jit::Graph>();
7171

72-
torch::jit::parseIR(graph, &*g);
72+
torch::jit::parseIR(graph, g.get());
7373

7474
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
7575

@@ -96,7 +96,7 @@ TEST(Converters, ATenExpandTileConvertsCorrectlyWithDynamicInput) {
9696

9797
auto g = std::make_shared<torch::jit::Graph>();
9898

99-
torch::jit::parseIR(graph, &*g);
99+
torch::jit::parseIR(graph, g.get());
100100

101101
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
102102

@@ -123,7 +123,7 @@ TEST(Converters, ATenExpandTileLastConvertsCorrectly) {
123123

124124
auto g = std::make_shared<torch::jit::Graph>();
125125

126-
torch::jit::parseIR(graph, &*g);
126+
torch::jit::parseIR(graph, g.get());
127127

128128
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
129129

@@ -150,7 +150,7 @@ TEST(Converters, ATenExpandTileLastConvertsCorrectlyWithDynamicInput) {
150150

151151
auto g = std::make_shared<torch::jit::Graph>();
152152

153-
torch::jit::parseIR(graph, &*g);
153+
torch::jit::parseIR(graph, g.get());
154154

155155
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
156156

@@ -177,7 +177,7 @@ TEST(Converters, ATenExpandNegativeSizeConvertsCorrectly) {
177177

178178
auto g = std::make_shared<torch::jit::Graph>();
179179

180-
torch::jit::parseIR(graph, &*g);
180+
torch::jit::parseIR(graph, g.get());
181181

182182
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
183183

@@ -204,7 +204,7 @@ TEST(Converters, ATenExpandNegativeSizeConvertsCorrectlyWithDynamicInput) {
204204

205205
auto g = std::make_shared<torch::jit::Graph>();
206206

207-
torch::jit::parseIR(graph, &*g);
207+
torch::jit::parseIR(graph, g.get());
208208

209209
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
210210

@@ -238,7 +238,7 @@ TEST(Converters, ATenExpandASConvertsCorrectly) {
238238

239239
auto g = std::make_shared<torch::jit::Graph>();
240240

241-
torch::jit::parseIR(graph, &*g);
241+
torch::jit::parseIR(graph, g.get());
242242

243243
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
244244
auto target_in = at::randint(1, 10, {2, 3, 1}, {at::kCUDA});
@@ -270,7 +270,7 @@ TEST(Converters, ATenExpandAsConvertsCorrectlyWithDynamicInput) {
270270

271271
auto g = std::make_shared<torch::jit::Graph>();
272272

273-
torch::jit::parseIR(graph, &*g);
273+
torch::jit::parseIR(graph, g.get());
274274

275275
auto in = at::randint(1, 10, {3, 1}, {at::kCUDA});
276276
auto target_in = at::randint(1, 10, {3, 4}, {at::kCUDA});
@@ -299,7 +299,7 @@ TEST(Converters, ATenRepeatConvertsCorrectly) {
299299

300300
auto g = std::make_shared<torch::jit::Graph>();
301301

302-
torch::jit::parseIR(graph, &*g);
302+
torch::jit::parseIR(graph, g.get());
303303

304304
auto in = at::randint(1, 10, {1, 3}, {at::kCUDA});
305305

@@ -325,7 +325,7 @@ TEST(Converters, ATenRepeatConvertsCorrectlyWithDynamicInput) {
325325

326326
auto g = std::make_shared<torch::jit::Graph>();
327327

328-
torch::jit::parseIR(graph, &*g);
328+
torch::jit::parseIR(graph, g.get());
329329

330330
auto in = at::randint(1, 10, {1, 3}, {at::kCUDA});
331331

@@ -351,7 +351,7 @@ TEST(Converters, ATenRepeat3dConvertsCorrectly) {
351351

352352
auto g = std::make_shared<torch::jit::Graph>();
353353

354-
torch::jit::parseIR(graph, &*g);
354+
torch::jit::parseIR(graph, g.get());
355355

356356
auto in = at::randint(1, 10, {2, 3, 2}, {at::kCUDA});
357357

@@ -377,7 +377,7 @@ TEST(Converters, ATenRepeat3dConvertsCorrectlyWithDynamicInput) {
377377

378378
auto g = std::make_shared<torch::jit::Graph>();
379379

380-
torch::jit::parseIR(graph, &*g);
380+
torch::jit::parseIR(graph, g.get());
381381

382382
auto in = at::randint(1, 10, {2, 3, 2}, {at::kCUDA});
383383

@@ -403,7 +403,7 @@ TEST(Converters, ATenRepeatExtraDimsConvertsCorrectly) {
403403

404404
auto g = std::make_shared<torch::jit::Graph>();
405405

406-
torch::jit::parseIR(graph, &*g);
406+
torch::jit::parseIR(graph, g.get());
407407

408408
auto in = at::randint(1, 10, {1, 3}, {at::kCUDA});
409409

@@ -429,7 +429,7 @@ TEST(Converters, ATenRepeatExtraDimsConvertsCorrectlyWithDynamicInput) {
429429

430430
auto g = std::make_shared<torch::jit::Graph>();
431431

432-
torch::jit::parseIR(graph, &*g);
432+
torch::jit::parseIR(graph, g.get());
433433

434434
auto in = at::randint(1, 10, {1, 3}, {at::kCUDA});
435435

0 commit comments

Comments
 (0)