port all JIT tests to gtest (pytorch#45264)

Summary:
Pull Request resolved: pytorch#45264

Context for why we are porting to gtest in: pytorch#45018.

This PR completes the process of porting and removes unused files/macros.

Test Plan: Imported from OSS

Reviewed By: ZolotukhinM

Differential Revision: D23901392

Pulled By: suo

fbshipit-source-id: 89526890e1a49462f3f77718f4ee273c5bc578ba

Author: suo

aten/src/ATen/test/thread_init_test.cpp

@@ -1,6 +1,6 @@
 #include <ATen/ATen.h>
 #include <ATen/Parallel.h>
-#include <test/cpp/jit/test_base.h>
+#include <test/cpp/tensorexpr/test_base.h>
 #include <thread>
 
 

test/cpp/jit/CMakeLists.txt

@@ -19,12 +19,9 @@ endif()
 
 # Build the cpp gtest binary containing the cpp-only tests.
 set(JIT_TEST_SRCS
-  ${JIT_TEST_ROOT}/gtest.cpp
   ${JIT_TEST_ROOT}/test_alias_analysis.cpp
   ${JIT_TEST_ROOT}/test_argument_spec.cpp
   ${JIT_TEST_ROOT}/test_autodiff.cpp
-  ${JIT_TEST_ROOT}/test_base.cpp
-  ${JIT_TEST_ROOT}/test_base.h
   ${JIT_TEST_ROOT}/test_class_import.cpp
   ${JIT_TEST_ROOT}/test_class_parser.cpp
   ${JIT_TEST_ROOT}/test_class_type.cpp

test/cpp/jit/README.md

@@ -1,69 +1,44 @@
 # JIT C++ Tests
 
-## How to add a new test
+## Adding a new test
 First, create a new test file. Test files should have be placed in this
 directory, with a name that starts with `test_`, like `test_foo.cpp`.
 
-Here is an example test file you can copy-paste.
+In general a single test suite
+
+Add your test file to the `JIT_TEST_SRCS` list in `test/cpp/jit/CMakeLists.txt`.
+
+A test file may look like:
 ```cpp
-#include <test/cpp/jit/test_base.h>
+#include <gtest/gtest.h>
 
-// Tests go in torch::jit
-namespace torch {
-namespace jit {
+using namespace ::torch::jit
 
-// 1. Test cases are void() functions.
-// 2. They start with the prefix `test`
-void testCaseOne() {
-    // ...
+TEST(FooTest, BarBaz) {
+   // ...
 }
 
-void testCaseTwo() {
-    // ...
-}
-}
+// Append '_CUDA' to the test case name will automatically filter it out if CUDA
+// is not compiled.
+TEST(FooTest, NeedsAGpu_CUDA) {
+   // ...
 }
-```
 
-Then, register your test in `tests.h`:
-```cpp
-// Add to TH_FORALL_TESTS_CUDA instead for CUDA-requiring tests
-#define TH_FORALL_TESTS(_)             \
-  _(ADFormulas)                        \
-  _(Attributes)                        \
-  ...
-  _(CaseOne)  // note that the `test` prefix is omitted.
-  _(CaseTwo)
-```
-
-We glob all the test files together in `CMakeLists.txt` so that you don't
-have to edit it every time you add a test. Unfortunately, this means that in
-order to get the build to pick up your new test file, you need to re-run
-cmake:
-```
-python setup.py build --cmake
+// Similarly, if only one GPU is detected, tests with `_MultiCUDA` at the end
+// will not be run.
+TEST(FooTest, NeedsMultipleGpus_MultiCUDA) {
+   // ...
+}
 ```
 
-## Why do we have two different test runners?
-We have two different ways of running our cpp tests:
-1. With `gtest`, from a standalone binary.
-2. With Python, from `TestJit.test_cpp` and `TestJit.test_cpp_cuda` (in
-   `test/test_jit.py`)
-
-We want both because we need to test things from a pure-C++ environment and
-with all our various Python patch-points enabled.
-
-## How do I run the tests?
+## Building and running the tests
 The following commands assume you are in PyTorch root.
 
-1. With `gtest`:
-   ```bash
-   # (re)build the test binary
-   ninja build/bin/test_jit
-   # run
-   build/bin/test_jit --gtest_filter='glob_style_filter*'
-   ```
-2. With Python:
-   ```
-   python test/test_jit.py TestJit.test_cpp TestJit.test_cpp_cuda
-   ```
+```bash
+# ... Build PyTorch from source, e.g.
+python setup.py develop
+# (re)build just the binary
+ninja -C build bin/test_jit
+# run tests
+build/bin/test_jit --gtest_filter='glob_style_filter*'
+```

test/cpp/jit/gtest.cpp

@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 
-#include <test/cpp/jit/test_base.h>
 #include <torch/csrc/jit/frontend/parser.h>
 #include <torch/csrc/jit/frontend/resolver.h>
 

test/cpp/jit/test_base.cpp

@@ -1,11 +1,12 @@
-#include <test/cpp/jit/test_base.h>
+#include <gtest/gtest.h>
+
 #include <test/cpp/jit/test_utils.h>
 #include <torch/torch.h>
 
 namespace torch {
 namespace jit {
 
-void testClassTypeAddRemoveAttr() {
+TEST(ClassTypeTest, AddRemoveAttr) {
   auto cu = std::make_shared<CompilationUnit>();
   auto cls = ClassType::create("foo.bar", cu, true);
   cls->addAttribute("attr1", TensorType::get(), true);
@@ -32,12 +33,12 @@ void testClassTypeAddRemoveAttr() {
   cls->addAttribute("attr1", IntType::get());
 }
 
-void testClassTypeAddRemoveConstant() {
+TEST(ClassTypeTest, AddRemoveConstant) {
   auto cu = std::make_shared<CompilationUnit>();
   auto cls = ClassType::create("foo.bar", cu);
   cls->addConstant("const1", IValue(1));
   cls->addConstant("const2", IValue(2));
-  cls->addConstant("const3", IValue(2));
+  cls->addConstant("const3", IValue(3));
   ASSERT_EQ(cls->numConstants(), 3);
   ASSERT_TRUE(cls->hasConstant("const1"));
   ASSERT_TRUE(cls->hasConstant("const2"));
@@ -46,7 +47,7 @@ void testClassTypeAddRemoveConstant() {
 
   ASSERT_EQ(cls->getConstant("const1").toInt(), 1);
   ASSERT_EQ(cls->getConstant("const2").toInt(), 2);
-  ASSERT_EQ(cls->getConstant("const2").toInt(), 3);
+  ASSERT_EQ(cls->getConstant("const3").toInt(), 3);
 
   cls->unsafeRemoveConstant("const2");
   ASSERT_TRUE(cls->hasConstant("const1"));