[jit] kill script namespace (pytorch#34515)

Summary:
Pull Request resolved: pytorch#34515

Once upon a time we thought this was necessary. In reality it is not, so
removing it.

For backcompat, our public interface (defined in `api/`) still has
typedefs to the old `script::` names.

There was only one collision: `Pass` as a `Stmt` and `Pass` as a graph
transform. I renamed one of them.

Test Plan: Imported from OSS

Differential Revision: D20353503

Pulled By: suo

fbshipit-source-id: 48bb911ce75120a8c9e0c6fb65262ef775dfba93

Author: suo

android/pytorch_android/generate_test_asset.cpp

@@ -13,7 +13,7 @@ int main(int argc, char* argv[]) {
   std::ifstream ifs(input_file_path);
   std::stringstream buffer;
   buffer << ifs.rdbuf();
-  torch::jit::script::Module m("TestModule");
+  torch::jit::Module m("TestModule");
 
   m.define(buffer.str());
   m.save(output_file_path);

android/pytorch_android/src/main/cpp/pytorch_jni_jit.cpp

@@ -58,7 +58,7 @@ class MemoryReadAdapter final : public caffe2::serialize::ReadAdapterInterface {
 class PytorchJni : public facebook::jni::HybridClass<PytorchJni> {
  private:
   friend HybridBase;
-  torch::jit::script::Module module_;
+  torch::jit::Module module_;
 
  public:
   constexpr static auto kJavaDescriptor = "Lorg/pytorch/NativePeer;";

android/pytorch_android/src/main/java/org/pytorch/Module.java

@@ -5,7 +5,7 @@
 import com.facebook.soloader.nativeloader.NativeLoader;
 import com.facebook.soloader.nativeloader.SystemDelegate;
 
-/** Java wrapper for torch::jit::script::Module. */
+/** Java wrapper for torch::jit::Module. */
 public class Module {
 
   private INativePeer mNativePeer;
@@ -14,7 +14,7 @@ public class Module {
    * Loads a serialized TorchScript module from the specified path on the disk.
    *
    * @param modelPath path to file that contains the serialized TorchScript module.
-   * @return new {@link org.pytorch.Module} object which owns torch::jit::script::Module.
+   * @return new {@link org.pytorch.Module} object which owns torch::jit::Module.
    */
   public static Module load(final String modelPath) {
     if (!NativeLoader.isInitialized()) {
@@ -49,7 +49,7 @@ public IValue runMethod(String methodName, IValue... inputs) {
   }
 
   /**
-   * Explicitly destroys the native torch::jit::script::Module. Calling this method is not required,
+   * Explicitly destroys the native torch::jit::Module. Calling this method is not required,
    * as the native object will be destroyed when this object is garbage-collected. However, the
    * timing of garbage collection is not guaranteed, so proactively calling {@code destroy} can free
    * memory more quickly. See {@link com.facebook.jni.HybridData#resetNative}.

aten/src/ATen/core/function.h

@@ -22,7 +22,7 @@ TORCH_API void preoptimizeGraph(std::shared_ptr<Graph>& graph);
 
 // A Function is a pure Graph with no implicit `self` object bound.
 // It contains schema information, and the executor that manages the
-// execution of the function. script::Method is a wrapper around a
+// execution of the function. Method is a wrapper around a
 // underlying Function that also provides a `self` object.
 struct TORCH_API Function {
   virtual bool isGraphFunction() const = 0;

aten/src/ATen/core/ivalue.cpp

@@ -378,7 +378,7 @@ std::vector<std::pair<IValue, IValue>> iterationOrder(const c10::Dict<IValue, IV
 }
 
 StrongTypePtr::StrongTypePtr(
-    std::shared_ptr<torch::jit::script::CompilationUnit> cu,
+    std::shared_ptr<torch::jit::CompilationUnit> cu,
     std::shared_ptr<Type> type) {
   cu_ = std::move(cu);
   type_ = type;

aten/src/ATen/core/ivalue.h

@@ -11,10 +11,8 @@ namespace jit {
 class CustomClassHolder : public c10::intrusive_ptr_target {};
 
 struct Function;
-namespace script {
 struct CompilationUnit;
 struct Module;
-}
 } // namespace jit
 } // namespace torch
 namespace c10 {
@@ -356,7 +354,7 @@ struct CAFFE2_API IValue final {
   c10::intrusive_ptr<ivalue::Object> toObject() const & ;
   const ivalue::Object& toObjectRef() const;
 
-  torch::jit::script::Module toModule() const;
+  torch::jit::Module toModule() const;
   bool isModule() const;
 
   // PyObject
@@ -692,10 +690,10 @@ struct CAFFE2_API WeakIValue final {
 // guaranteed to stay alive as long as we hold this object.
 struct TORCH_API StrongTypePtr {
   StrongTypePtr(
-      std::shared_ptr<torch::jit::script::CompilationUnit> cu,
+      std::shared_ptr<torch::jit::CompilationUnit> cu,
       std::shared_ptr<Type> type);
 
-  std::shared_ptr<torch::jit::script::CompilationUnit> cu_;
+  std::shared_ptr<torch::jit::CompilationUnit> cu_;
   std::shared_ptr<Type> type_;
 };
 

aten/src/ATen/core/ivalue_inl.h

@@ -15,9 +15,7 @@
 namespace torch {
 namespace jit {
 struct Function;
-namespace script {
 struct CompilationUnit;
-}
 } // namespace jit
 } // namespace torch
 namespace c10 {
@@ -406,7 +404,7 @@ struct C10_EXPORT ivalue::Object final : c10::intrusive_ptr_target {
   }
   std::shared_ptr<ClassType> type() const;
 
-  std::shared_ptr<torch::jit::script::CompilationUnit> compilation_unit() {
+  std::shared_ptr<torch::jit::CompilationUnit> compilation_unit() {
     return type_.cu_;
   }
 
@@ -868,7 +866,7 @@ IValue from_(c10::intrusive_ptr<T> x, std::false_type) {
   auto res = getCustomClassType<inputType>();
   auto retObject = ivalue::Object::create(
     StrongTypePtr(
-      std::shared_ptr<torch::jit::script::CompilationUnit>(),
+      std::shared_ptr<torch::jit::CompilationUnit>(),
       std::move(res)),
     1);
   auto objPtr = c10::static_intrusive_pointer_cast<torch::jit::CustomClassHolder>(std::move(x));

aten/src/ATen/core/jit_type.h

@@ -17,9 +17,7 @@
 struct ClassType;
 namespace torch {
 namespace jit {
-namespace script {
 struct CompilationUnit;
-}
 } // namespace jit
 } // namespace torch
 
@@ -1491,7 +1489,7 @@ CAFFE2_API bool elementTypeCanBeInferredFromMembers(const TypePtr& elem_type);
 
 struct ClassType;
 using ClassTypePtr = std::shared_ptr<ClassType>;
-using ::torch::jit::script::CompilationUnit;
+using ::torch::jit::CompilationUnit;
 
 // This represents a class in TorchScript.
 struct CAFFE2_API ClassType : public NamedType {
@@ -1801,7 +1799,7 @@ struct CAFFE2_API ClassType : public NamedType {
 
 struct InterfaceType;
 using InterfaceTypePtr = std::shared_ptr<InterfaceType>;
-using ::torch::jit::script::CompilationUnit;
+using ::torch::jit::CompilationUnit;
 
 // Interfaces are a list of abstract methods that a class might meet.
 // If a class provides those methods, it implicitly meets the interface.

binaries/dump_operator_names.cc

@@ -24,7 +24,7 @@
 
 namespace torch {
 namespace jit {
-void dump_opnames(const script::Module& m, std::unordered_set<std::string>& opnames) {
+void dump_opnames(const Module& m, std::unordered_set<std::string>& opnames) {
   auto methods = m.get_methods();
   for (const auto& method : methods) {
     const auto& func = method.function();

caffe2/contrib/pytorch/script_module_op.cc

@@ -7,8 +7,8 @@
 namespace caffe2 {
 
 using torch::jit::IValue;
-using torch::jit::script::Method;
-using torch::jit::script::Module;
+using torch::jit::Method;
+using torch::jit::Module;
 
 namespace {
 class ScriptModuleSerializer : public BlobSerializerBase {
@@ -31,7 +31,7 @@ class ScriptModuleSerializer : public BlobSerializerBase {
     // the more efficient serialization version (if we ever get to that point)
     BlobProto blob_proto;
     blob_proto.set_name(name);
-    blob_proto.set_type("torch::jit::script::Module");
+    blob_proto.set_type("torch::jit::Module");
     blob_proto.set_content(ss.str());
     acceptor(name, SerializeBlobProtoAsString_EnforceCheck(blob_proto));
   }
@@ -134,7 +134,7 @@ REGISTER_BLOB_SERIALIZER(
 // NB: the first argument to REGISTER_BLOB_DESERIALIZER macro doesn't really
 // need to be a real type, it just get converted to string
 REGISTER_BLOB_DESERIALIZER(
-    torch::jit::script::Module,
+    torch::jit::Module,
     ScriptModuleDeserializer);
 
 OPERATOR_SCHEMA(ScriptModule)

caffe2/python/pybind_state.cc

@@ -94,12 +94,12 @@ REGISTER_BLOB_FETCHER((TypeMeta::Id<string>()), StringFetcher);
 class ScriptModuleFetcher : public BlobFetcherBase {
  public:
   pybind11::object Fetch(const Blob& blob) override {
-    return py::cast(*blob.Get<std::unique_ptr<torch::jit::script::Module>>());
+    return py::cast(*blob.Get<std::unique_ptr<torch::jit::Module>>());
   }
 };
 
 REGISTER_BLOB_FETCHER(
-    (TypeMeta::Id<std::unique_ptr<torch::jit::script::Module>>()),
+    (TypeMeta::Id<std::unique_ptr<torch::jit::Module>>()),
     caffe2::python::ScriptModuleFetcher);
 #endif
 
@@ -247,9 +247,9 @@ bool feedBlob(
     return true;
   }
 #ifdef FBCODE_CAFFE2
-  if (auto module = torch::jit::script::as_module(arg)) {
-    blob->GetMutable<std::unique_ptr<torch::jit::script::Module>>()->reset(
-        new torch::jit::script::Module(*module));
+  if (auto module = torch::jit::as_module(arg)) {
+    blob->GetMutable<std::unique_ptr<torch::jit::Module>>()->reset(
+        new torch::jit::Module(*module));
     return true;
   }
 #endif

docs/source/jit.rst

@@ -213,7 +213,7 @@ Disable JIT for Debugging
     Python. Since TorchScript (scripting and tracing) are disabled with this flag,
     you can use tools like ``pdb`` to debug the model code.
 
-    Given an example script::
+    Given an example 
 
         @torch.jit.script
         def scripted_fn(x : torch.Tensor):

docs/source/notes/large_scale_deployments.rst

@@ -120,8 +120,8 @@ usage might look like:
 
 .. code-block:: cpp
 
-    SetExportModuleExtraFilesHook([](const script::Module&) {
-        script::ExtraFilesMap files;
+    SetExportModuleExtraFilesHook([](const Module&) {
+        ExtraFilesMap files;
         files["producer_info.json"] = "{\"user\": \"" + getenv("USER") + "\"}";
         return files;
     });

docs/source/org/pytorch/Module.rst

@@ -8,7 +8,7 @@ Module
 
 .. java:type:: public class Module
 
-   Java wrapper for torch::jit::script::Module.
+   Java wrapper for torch::jit::Module.
 
 Methods
 -------
@@ -18,7 +18,7 @@ destroy
 .. java:method:: public void destroy()
    :outertype: Module
 
-   Explicitly destroys the native torch::jit::script::Module. Calling this method is not required, as the native object will be destroyed when this object is garbage-collected. However, the timing of garbage collection is not guaranteed, so proactively calling \ ``destroy``\  can free memory more quickly. See \ :java:ref:`com.facebook.jni.HybridData.resetNative`\ .
+   Explicitly destroys the native torch::jit::Module. Calling this method is not required, as the native object will be destroyed when this object is garbage-collected. However, the timing of garbage collection is not guaranteed, so proactively calling \ ``destroy``\  can free memory more quickly. See \ :java:ref:`com.facebook.jni.HybridData.resetNative`\ .
 
 forward
 ^^^^^^^
@@ -40,7 +40,7 @@ load
    Loads a serialized TorchScript module from the specified path on the disk.
 
    :param modelPath: path to file that contains the serialized TorchScript module.
-   :return: new \ :java:ref:`org.pytorch.Module`\  object which owns torch::jit::script::Module.
+   :return: new \ :java:ref:`org.pytorch.Module`\  object which owns torch::jit::Module.
 
 runMethod
 ^^^^^^^^^

ios/TestApp/TestAppTests/TestAppTests.mm

@@ -7,7 +7,7 @@ @interface TestAppTests : XCTestCase
 @end
 
 @implementation TestAppTests {
-  torch::jit::script::Module _module;
+  torch::jit::Module _module;
 }
 
 + (void)setUp {