[C++ API] Graduate set/getAtenSeed

nicolasvasilache · nicolasvasilache · commit 52cc55b5c03e · 2018-05-04T12:58:14.000-06:00
These functions were confined to a test harness but they are more widely
useful.
Graduate them to aten.h
diff --git a/tc/aten/aten-inl.h b/tc/aten/aten-inl.h
@@ -46,5 +46,15 @@ inline std::vector<DLConstTensorUPtr> makeDLConstTensors(
   }
   return dlTensors;
 }
+
+inline void setAtenSeed(uint64_t seed, at::Backend backend) {
+  at::Generator& gen = at::globalContext().defaultGenerator(backend);
+  gen.manualSeed(seed);
+}
+
+inline uint64_t getAtenSeed(at::Backend backend) {
+  at::Generator& gen = at::globalContext().defaultGenerator(backend);
+  return gen.seed();
+}
 } // namespace aten
 } // namespace tc
diff --git a/tc/aten/aten.h b/tc/aten/aten.h
@@ -31,6 +31,9 @@ inline std::vector<DLTensorUPtr> makeDLTensors(
 inline std::vector<DLConstTensorUPtr> makeDLConstTensors(
     const std::vector<at::Tensor>& tensors);
 
+inline void setAtenSeed(uint64_t seed, at::Backend backend);
+inline uint64_t getAtenSeed(at::Backend backend);
+
 } // namespace aten
 } // namespace tc
 
diff --git a/tc/benchmarks/MLP_model.cc b/tc/benchmarks/MLP_model.cc
@@ -1001,6 +1001,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/benchmarks/batchmatmul.cc b/tc/benchmarks/batchmatmul.cc
@@ -182,6 +182,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/benchmarks/group_convolution.cc b/tc/benchmarks/group_convolution.cc
@@ -380,6 +380,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/benchmarks/tmm.cc b/tc/benchmarks/tmm.cc
@@ -231,6 +231,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/examples/blockdiagperm.cc b/tc/examples/blockdiagperm.cc
@@ -133,6 +133,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/examples/tensordot.cc b/tc/examples/tensordot.cc
@@ -124,6 +124,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/tc/examples/wavenet.cc b/tc/examples/wavenet.cc
@@ -174,6 +174,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/test/cuda/test_compile_and_run.cc b/test/cuda/test_compile_and_run.cc
@@ -278,6 +278,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/test/cuda/test_corner_cases.cc b/test/cuda/test_corner_cases.cc
@@ -286,6 +286,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/test/cuda/test_tc_mapper.cc b/test/cuda/test_tc_mapper.cc
@@ -419,6 +419,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/test/cuda/test_tc_mapper_bugs.cc b/test/cuda/test_tc_mapper_bugs.cc
@@ -778,6 +778,6 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   ::google::InitGoogleLogging(argv[0]);
-  setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
+  tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);
   return RUN_ALL_TESTS();
 }
diff --git a/test/test_harness_aten_cuda.h b/test/test_harness_aten_cuda.h
@@ -42,16 +42,6 @@ at::Tensor subtensor(at::Tensor& tensor, int dim, int groups, int g) {
   return tensor.narrow(dim, n * g, n).contiguous();
 }
 
-void setAtenSeed(uint64_t seed, at::Backend backend) {
-  at::Generator& gen = at::globalContext().defaultGenerator(backend);
-  gen.manualSeed(seed);
-}
-
-uint64_t getAtenSeed(at::Backend backend) {
-  at::Generator& gen = at::globalContext().defaultGenerator(backend);
-  return gen.seed();
-}
-
 void benchmarkKernelOptions(
     const std::string& tc,
     const std::string& name,

Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,6 @@ int main(int argc, char** argv) {`
`1001`	`1001`	`::testing::InitGoogleTest(&argc, argv);`
`1002`	`1002`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`1003`	`1003`	`::google::InitGoogleLogging(argv[0]);`
`1004`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`1004`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`1005`	`1005`	`return RUN_ALL_TESTS();`
`1006`	`1006`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,6 @@ int main(int argc, char** argv) {`
`182`	`182`	`::testing::InitGoogleTest(&argc, argv);`
`183`	`183`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`184`	`184`	`::google::InitGoogleLogging(argv[0]);`
`185`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`185`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`186`	`186`	`return RUN_ALL_TESTS();`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,6 @@ int main(int argc, char** argv) {`
`380`	`380`	`::testing::InitGoogleTest(&argc, argv);`
`381`	`381`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`382`	`382`	`::google::InitGoogleLogging(argv[0]);`
`383`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`383`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`384`	`384`	`return RUN_ALL_TESTS();`
`385`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,6 @@ int main(int argc, char** argv) {`
`231`	`231`	`::testing::InitGoogleTest(&argc, argv);`
`232`	`232`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`233`	`233`	`::google::InitGoogleLogging(argv[0]);`
`234`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`234`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`235`	`235`	`return RUN_ALL_TESTS();`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,6 @@ int main(int argc, char** argv) {`
`133`	`133`	`::testing::InitGoogleTest(&argc, argv);`
`134`	`134`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`135`	`135`	`::google::InitGoogleLogging(argv[0]);`
`136`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`136`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`137`	`137`	`return RUN_ALL_TESTS();`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,6 @@ int main(int argc, char** argv) {`
`124`	`124`	`::testing::InitGoogleTest(&argc, argv);`
`125`	`125`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`126`	`126`	`::google::InitGoogleLogging(argv[0]);`
`127`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`127`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`128`	`128`	`return RUN_ALL_TESTS();`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,6 @@ int main(int argc, char** argv) {`
`174`	`174`	`::testing::InitGoogleTest(&argc, argv);`
`175`	`175`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`176`	`176`	`::google::InitGoogleLogging(argv[0]);`
`177`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`177`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`178`	`178`	`return RUN_ALL_TESTS();`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,6 @@ int main(int argc, char** argv) {`
`278`	`278`	`::testing::InitGoogleTest(&argc, argv);`
`279`	`279`	`::gflags::ParseCommandLineFlags(&argc, &argv, true);`
`280`	`280`	`::google::InitGoogleLogging(argv[0]);`
`281`		`- setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
	`281`	`+ tc::aten::setAtenSeed(tc::initRandomSeed(), at::Backend::CUDA);`
`282`	`282`	`return RUN_ALL_TESTS();`
`283`	`283`	`}`