Skip to content

Commit 38d9a49

Browse files
njzjznjzjz
committed
fix ifndef
1 parent e259d57 commit 38d9a49

36 files changed

Lines changed: 122 additions & 122 deletions

‎source/api_c/tests/test_deepdipole_hpp.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ class TestInferDeepDipoleNew : public ::testing::Test {
221221
deepmd::hpp::DeepTensor dp;
222222

223223
void SetUp() override {
224-
if (NOT BUILD_TENSORFLOW) {
224+
#ifndef BUILD_TENSORFLOW
225225
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
226-
}
226+
#endif
227227
std::string file_name = "../../tests/infer/deepdipole_new.pbtxt";
228228
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deepdipole_new.pbtxt",
229229
"deepdipole_new.pb");

‎source/api_c/tests/test_deeppolar_hpp.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ class TestInferDeepPolar : public ::testing::Test {
3232
deepmd::hpp::DeepTensor dp;
3333

3434
void SetUp() override {
35-
if (NOT BUILD_TENSORFLOW) {
35+
#ifndef BUILD_TENSORFLOW
3636
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
37-
}
37+
#endif
3838
std::string file_name = "../../tests/infer/deeppolar.pbtxt";
3939
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppolar.pbtxt",
4040
"deeppolar.pb");
@@ -456,9 +456,9 @@ class TestInferDeepPolarNew : public ::testing::Test {
456456
deepmd::hpp::DeepTensor dp;
457457

458458
void SetUp() override {
459-
if (NOT BUILD_TENSORFLOW) {
459+
#ifndef BUILD_TENSORFLOW
460460
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
461-
}
461+
#endif
462462
std::string file_name = "../../tests/infer/deeppolar_new.pbtxt";
463463
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppolar_new.pbtxt",
464464
"deeppolar_new.pb");

‎source/api_c/tests/test_deeppot_a_fparam_aparam.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class TestInferDeepPotAFParamAParam : public ::testing::Test {
7272
deepmd::hpp::DeepPot dp;
7373

7474
void SetUp() override {
75-
if (NOT BUILD_TENSORFLOW) {
75+
#ifndef BUILD_TENSORFLOW
7676
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
77-
}
77+
#endif
7878
std::string file_name = "../../tests/infer/fparam_aparam.pbtxt";
7979
deepmd::hpp::convert_pbtxt_to_pb(file_name, "fparam_aparam.pb");
8080

@@ -397,9 +397,9 @@ class TestInferAParamNAll : public ::testing::Test {
397397
deepmd::hpp::DeepPot dp;
398398

399399
void SetUp() override {
400-
if (NOT BUILD_TENSORFLOW) {
400+
#ifndef BUILD_TENSORFLOW
401401
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
402-
}
402+
#endif
403403
std::string file_name = "../../tests/infer/pairwise_dprc.pbtxt";
404404
deepmd::hpp::convert_pbtxt_to_pb(file_name, "pairwise_dprc.pb");
405405
dp.init("pairwise_dprc.pb");

‎source/api_c/tests/test_deeppot_a_fparam_aparam_nframes.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ class TestInferDeepPotAFparamAparamNFrames : public ::testing::Test {
116116
deepmd::hpp::DeepPot dp;
117117

118118
void SetUp() override {
119-
if (NOT BUILD_TENSORFLOW) {
119+
#ifndef BUILD_TENSORFLOW
120120
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
121-
}
121+
#endif
122122
std::string file_name = "../../tests/infer/fparam_aparam.pbtxt";
123123
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/fparam_aparam.pbtxt",
124124
"fparam_aparam.pb");
@@ -760,9 +760,9 @@ class TestInferDeepPotAFparamAparamNFramesSingleParam : public ::testing::Test {
760760
deepmd::hpp::DeepPot dp;
761761

762762
void SetUp() override {
763-
if (NOT BUILD_TENSORFLOW) {
763+
#ifndef BUILD_TENSORFLOW
764764
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
765-
}
765+
#endif
766766
std::string file_name = "../../tests/infer/fparam_aparam.pbtxt";
767767
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/fparam_aparam.pbtxt",
768768
"fparam_aparam.pb");

‎source/api_c/tests/test_deeppot_a_hpp.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ class TestInferDeepPotAHPP : public ::testing::Test {
6666
deepmd::hpp::DeepPot dp;
6767

6868
void SetUp() override {
69-
if (NOT BUILD_TENSORFLOW) {
69+
#ifndef BUILD_TENSORFLOW
7070
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
71-
}
71+
#endif
7272
std::string file_name = "../../tests/infer/deeppot.pbtxt";
7373
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppot.pbtxt",
7474
"deeppot.pb");
@@ -560,9 +560,9 @@ class TestInferDeepPotANoPbcHPP : public ::testing::Test {
560560
deepmd::hpp::DeepPot dp;
561561

562562
void SetUp() override {
563-
if (NOT BUILD_TENSORFLOW) {
563+
#ifndef BUILD_TENSORFLOW
564564
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
565-
}
565+
#endif
566566
std::string file_name = "../../tests/infer/deeppot.pbtxt";
567567
deepmd::hpp::convert_pbtxt_to_pb(file_name, "deeppot.pb");
568568

‎source/api_c/tests/test_deeppot_a_nframes_hpp.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ class TestInferDeepPotANFrames : public ::testing::Test {
109109
deepmd::hpp::DeepPot dp;
110110

111111
void SetUp() override {
112-
if (NOT BUILD_TENSORFLOW) {
112+
#ifndef BUILD_TENSORFLOW
113113
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
114-
}
114+
#endif
115115
std::string file_name = "../../tests/infer/deeppot.pbtxt";
116116
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppot.pbtxt",
117117
"deeppot.pb");
@@ -722,9 +722,9 @@ class TestInferDeepPotANFramesNoPbc : public ::testing::Test {
722722
deepmd::hpp::DeepPot dp;
723723

724724
void SetUp() override {
725-
if (NOT BUILD_TENSORFLOW) {
725+
#ifndef BUILD_TENSORFLOW
726726
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
727-
}
727+
#endif
728728
std::string file_name = "../../tests/infer/deeppot.pbtxt";
729729
deepmd::hpp::convert_pbtxt_to_pb(file_name, "deeppot.pb");
730730

‎source/api_c/tests/test_deeppot_model_devi_fparam_aparam.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class TestInferDeepPotModeDeviFparamAparam : public ::testing::Test {
3030
deepmd::hpp::DeepPotModelDevi dp_md;
3131

3232
void SetUp() override {
33-
if (NOT BUILD_TENSORFLOW) {
33+
#ifndef BUILD_TENSORFLOW
3434
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
35-
}
35+
#endif
3636
{
3737
std::string file_name = "../../tests/infer/fparam_aparam.pbtxt";
3838
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/fparam_aparam.pbtxt",

‎source/api_c/tests/test_deeppot_model_devi_hpp.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class TestInferDeepPotModeDevi : public ::testing::Test {
2424
deepmd::hpp::DeepPotModelDevi dp_md;
2525

2626
void SetUp() override {
27-
if (NOT BUILD_TENSORFLOW) {
27+
#ifndef BUILD_TENSORFLOW
2828
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
29-
}
29+
#endif
3030
{
3131
std::string file_name = "../../tests/infer/deeppot.pbtxt";
3232
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppot.pbtxt",
@@ -77,9 +77,9 @@ class TestInferDeepPotModeDeviPython : public ::testing::Test {
7777
deepmd::hpp::DeepPotModelDevi dp_md;
7878

7979
void SetUp() override {
80-
if (NOT BUILD_TENSORFLOW) {
80+
#ifndef BUILD_TENSORFLOW
8181
GTEST_SKIP() << "Skip because TensorFlow support is not enabled.";
82-
}
82+
#endif
8383
{
8484
std::string file_name = "../../tests/infer/deeppot.pbtxt";
8585
deepmd::hpp::convert_pbtxt_to_pb("../../tests/infer/deeppot.pbtxt",

‎source/api_c/tests/test_deepspin_a.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class TestInferDeepSpinA : public ::testing::Test {
5656
DP_DeepSpin* dp;
5757

5858
void SetUp() override {
59-
if (NOT BUILD_PYTORCH) {
59+
#ifndef BUILD_PYTORCH
6060
GTEST_SKIP() << "Skip because PyTorch support is not enabled.";
61-
}
61+
#endif
6262
dp = DP_NewDeepSpin("../../tests/infer/deeppot_dpa_spin.pth");
6363

6464
natoms = expected_e.size();
@@ -239,9 +239,9 @@ class TestInferDeepSpinANoPBC : public ::testing::Test {
239239
DP_DeepSpin* dp;
240240

241241
void SetUp() override {
242-
if (NOT BUILD_PYTORCH) {
242+
#ifndef BUILD_PYTORCH
243243
GTEST_SKIP() << "Skip because PyTorch support is not enabled.";
244-
}
244+
#endif
245245
dp = DP_NewDeepSpin("../../tests/infer/deeppot_dpa_spin.pth");
246246

247247
natoms = expected_e.size();

‎source/api_c/tests/test_deepspin_a_hpp.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class TestInferDeepSpinAHPP : public ::testing::Test {
5656
deepmd::hpp::DeepSpin dp;
5757

5858
void SetUp() override {
59-
if (NOT BUILD_PYTORCH) {
59+
#ifndef BUILD_PYTORCH
6060
GTEST_SKIP() << "Skip because PyTorch support is not enabled.";
61-
}
61+
#endif
6262
dp.init("../../tests/infer/deeppot_dpa_spin.pth");
6363

6464
natoms = expected_e.size();
@@ -211,9 +211,9 @@ class TestInferDeepSpinANoPbcHPP : public ::testing::Test {
211211
deepmd::hpp::DeepSpin dp;
212212

213213
void SetUp() override {
214-
if (NOT BUILD_PYTORCH) {
214+
#ifndef BUILD_PYTORCH
215215
GTEST_SKIP() << "Skip because PyTorch support is not enabled.";
216-
}
216+
#endif
217217
dp.init("../../tests/infer/deeppot_dpa_spin.pth");
218218

219219
natoms = expected_e.size();

0 commit comments

Comments
 (0)