Remove custom python version preproc flag (#234)

Summary:
As title, replace with py_version_hex.

Pull Request resolved: #234

Test Plan: Unit tests should pass.

Reviewed By: d4l3k, PaliC

Differential Revision: D40733843

Pulled By: anirbanr-fb-r2p

fbshipit-source-id: 3f75ae057a130d77055b49945e5d5df811170a95

Author: anirbanr-fb-r2p

README.md

@@ -15,7 +15,7 @@ Requirements:
   * x86_64 (Beta)
   * arm64/aarch64 (Prototype)
 
-> ℹ️ This is project is in Beta. `torch::deploy` is ready for use in production environments but may have some rough edges that we're continuously working on improving. We're always interested in hearing feedback and usecases that you might have. Feel free to reach out!
+> ℹ️ `torch::deploy` is ready for use in production environments, but is in Beta and may have some rough edges that we're continuously working on improving. We're always interested in hearing feedback and usecases that you might have. Feel free to reach out!
 
 ## Installation
 

multipy/runtime/CMakeLists.txt

@@ -12,8 +12,6 @@ project(MultipyRuntime)
 option(BUILD_CUDA_TESTS "Set to ON in order to build cuda tests. By default we do not" OFF)
 option(GDB_ON "Sets to debug mode (for gdb), defaults to OFF" OFF)
 
-OPTION(LEGACY_PYTHON_PRE_3_8 "Whether to use Python 3.7 codepaths." OFF)
-
 if(GDB_ON)
   set(CMAKE_BUILD_TYPE Debug)
 endif()
@@ -95,10 +93,6 @@ set(INTERPRETER_TEST_SOURCES_GPU
 
 add_executable(test_deploy ${INTERPRETER_TEST_SOURCES})
 # target_compile_definitions(test_deploy PUBLIC TEST_CUSTOM_LIBRARY)
-if (${LEGACY_PYTHON_PRE_3_8})
-  message(STATUS "LEGACY_PYTHON_PRE_3_8 set in parent cmakefile.")
-  target_compile_definitions(test_deploy PUBLIC LEGACY_PYTHON_PRE_3_8)
-endif()
 target_include_directories(test_deploy PRIVATE ${PYTORCH_ROOT}/torch)
 target_link_libraries(test_deploy
   PUBLIC "-Wl,--no-as-needed -rdynamic" gtest dl torch_deploy_interface c10 torch_cpu

multipy/runtime/interpreter/CMakeLists.txt

@@ -11,8 +11,6 @@ SET(INTERPRETER_DIR "${DEPLOY_DIR}/interpreter" PARENT_SCOPE)
 
 SET(MULTIPY_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../../utils")
 
-OPTION(LEGACY_PYTHON_PRE_3_8 "Whether to use Python 3.7 codepaths." OFF)
-
 message(STATUS "Python3_EXECUTABLE - ${Python3_EXECUTABLE}" )
 message(STATUS "Python3_SITELIB - ${Python3_SITELIB}" )
 message(STATUS "Python3_LIBRARIES - ${Python3_LIBRARIES}" )
@@ -27,11 +25,6 @@ message(STATUS "Python3_STATIC_LIBRARIES - ${Python3_STATIC_LIBRARIES}" )
 
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/../..)
 
-if (${LEGACY_PYTHON_PRE_3_8})
-  message(STATUS "LEGACY_PYTHON_PRE_3_8 set")
-  add_compile_definitions(LEGACY_PYTHON_PRE_3_8)
-endif()
-
 # add gtest dependency
 include(FetchContent)
 FetchContent_Declare(
@@ -89,5 +82,3 @@ target_link_libraries(torch_deployinterpreter PRIVATE fmt::fmt-header-only)
 target_link_libraries(torch_deployinterpreter PRIVATE torch_python)
 target_link_libraries(torch_deployinterpreter PRIVATE gtest)
 target_link_libraries(torch_deployinterpreter PRIVATE multipy_torch)
-
-unset(LEGACY_PYTHON_PRE_3_8)

multipy/runtime/interpreter/builtin_registry.cpp

@@ -64,7 +64,8 @@ void BuiltinRegistry::runPreInitialization() {
   appendCPythonInittab();
 }
 
-#ifndef LEGACY_PYTHON_PRE_3_8
+#if PY_VERSION_HEX >= 0x03080100
+// For Python 3.8+.
 const char* metaPathSetupTemplate = R"PYTHON(
 import sys
 from importlib.metadata import DistributionFinder, Distribution
@@ -109,6 +110,7 @@ class DummyDistribution(Distribution):
 sys.meta_path.insert(0, F())
 )PYTHON";
 #else
+// For Python 3.7.
 const char* metaPathSetupTemplate = R"PYTHON(
 import sys
 class F:

multipy/runtime/interpreter/interpreter_impl.cpp

@@ -369,7 +369,8 @@ ConcreteInterpreterImplConstructorCommon(
     const std::vector<std::string>& plugin_paths) {
   BuiltinRegistry::runPreInitialization();
 
-#ifndef LEGACY_PYTHON_PRE_3_8
+#if PY_VERSION_HEX >= 0x03080100
+  // For Python 3.8+.
   PyPreConfig preconfig;
   PyPreConfig_InitIsolatedConfig(&preconfig);
   PyStatus status = Py_PreInitialize(&preconfig);
@@ -408,6 +409,7 @@ ConcreteInterpreterImplConstructorCommon(
   TORCH_INTERNAL_ASSERT(!PyStatus_Exception(status))
 
 #else
+  // For Python 3.7.
   Py_InitializeEx(1);
   TORCH_INTERNAL_ASSERT(Py_IsInitialized);
 #endif

multipy/runtime/test_deploy.cpp

@@ -473,7 +473,8 @@ result = torch.Tensor([1,2,3])
   EXPECT_TRUE(w_grad0.equal(w_grad1));
 }
 
-#ifndef LEGACY_PYTHON_PRE_3_8
+// For Python 3.8+ only.
+#if PY_VERSION_HEX >= 0x03080100
 TEST(TorchpyTest, ImportlibMetadata) {
   torch::deploy::InterpreterManager m(1);
   m.registerModuleSource("importlib_test", R"PYTHON(

setup.py

@@ -78,14 +78,11 @@ def run(self):
         build_dir_abs = base_dir + "/" + build_dir
         if not os.path.exists(build_dir_abs):
             os.makedirs(build_dir_abs)
-        legacy_python_cmake_flag = "OFF" if sys.version_info.minor > 7 else "ON"
 
         print(f"-- Running multipy runtime makefile in dir {build_dir_abs}")
         try:
             subprocess.run(
-                [
-                    f"cmake -DBUILD_CUDA_TESTS={self.cuda_tests_flag} -DLEGACY_PYTHON_PRE_3_8={legacy_python_cmake_flag} .."
-                ],
+                [f"cmake -DBUILD_CUDA_TESTS={self.cuda_tests_flag} .."],
                 cwd=build_dir_abs,
                 shell=True,
                 check=True,