<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/baf64c617658b6b9fc79e592b8f21813f76efc64">https://github.com/macports/macports-ports/commit/baf64c617658b6b9fc79e592b8f21813f76efc64</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit baf64c617658b6b9fc79e592b8f21813f76efc64
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Mar 18 13:52:20 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-pytorch: Update to version 2.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Co-authored-by: Joshua Root <jmr@macports.org>
</span>---
 python/py-pytorch/Portfile                         |   7 +-
 python/py-pytorch/files/FindMKL-OMP.patch          |   4 +-
 python/py-pytorch/files/Werror.patch               | 205 ++++++++++++++++++++-
 python/py-pytorch/files/patch-glog-init-check.diff |   4 +-
 4 files changed, 208 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/Portfile b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d5630dc4bd..184f9ec39f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,13 +7,12 @@ PortGroup           mpi 1.0
</span> PortGroup           python 1.0
 
 name                py-pytorch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.13.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.0.0
</span> revision            0
 github.setup        pytorch pytorch ${version} v
 fetch.type          git
 
 supported_archs     arm64 x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           {darwin >= 16}
</span> 
 license             BSD
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +33,6 @@ homepage            https://pytorch.org/
</span> 
 python.versions     37 38 39 310
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args      -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> mpi.setup
 
 # Compiler selection
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +103,6 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-click \
         port:py${python.version}-cffi \
         port:py${python.version}-future \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-gmpy \
</span>         port:py${python.version}-numpy \
         port:py${python.version}-pybind11 \
         port:py${python.version}-typing_extensions \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +145,6 @@ if {${name} ne ${subport}} {
</span>     # ZSTD support broke with 1.2.0-1.12.0. Check with future releases.
     build.env-append \
                     CMAKE_LIBRARY_PATH=${prefix}/lib:${prefix}/lib/libomp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CMAKE_CXX_FLAGS=-Wno-error=bitwise-instead-of-logical \
</span>                     LIBRARY_PATH=${prefix}/lib:${prefix}/lib/libomp \
                     OpenCV_DIR=${prefix}/libexec/opencv4/cmake \
                     USE_CCACHE=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/FindMKL-OMP.patch b/python/py-pytorch/files/FindMKL-OMP.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cb10be78982..26aeecd748e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/files/FindMKL-OMP.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/FindMKL-OMP.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake
 index 1b1423988..d7c359c53 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/Modules/FindMKL.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/Modules/FindMKL.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/Modules/FindMKL.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Modules/FindMKL.cmake
</span> @@ -102,6 +102,9 @@ IF (EXISTS ${INTEL_MKL_DIR})
    ENDIF()
  ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/Werror.patch b/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index eafa1778d92..2f0f8daf213 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/third_party/fbgemm/CMakeLists.txt.orig       2023-03-31 09:12:01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/third_party/fbgemm/CMakeLists.txt    2023-03-31 09:14:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/fbgemm/CMakeLists.txt.orig 2023-03-31 09:12:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/fbgemm/CMakeLists.txt      2023-03-31 09:14:00
</span> @@ -144,7 +144,6 @@
  else(MSVC)
    string(APPEND CMAKE_CXX_FLAGS " -Wall")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,3 +8,204 @@
</span>    string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
    target_compile_options(fbgemm_avx2 PRIVATE
      "-m64" "-mavx2" "-mf16c" "-mfma")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- caffe2/CMakeLists.txt.orig  2023-04-01 02:16:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ caffe2/CMakeLists.txt  2023-04-01 02:34:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -532,8 +532,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Required workaround for LLVM 9 includes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  # Force -Werror on several files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable certain warnings for GCC-9.X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/ideep/mkl-dnn/cmake/platform.cmake.orig    2023-04-01 02:19:51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/ideep/mkl-dnn/cmake/platform.cmake 2023-04-01 02:36:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         append(CMAKE_CCXX_FLAGS "/fp:precise")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(UNIX OR MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    append(CMAKE_CCXX_FLAGS "-Wall -Werror -Wno-unknown-pragmas")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(DNNL_GRAPH_WITH_SYCL OR CMAKE_BASE_NAME STREQUAL "icx" OR CMAKE_BASE_NAME STREQUAL "icpx")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # When using Debug build mode CMake adds "-g" option without "-O0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # causing the warning. This probably happens because clang/gcc compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/ideep/mkl-dnn/src/backend/graph_compiler/core/CMakeLists.txt.orig  2023-04-01 02:19:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/ideep/mkl-dnn/src/backend/graph_compiler/core/CMakeLists.txt       2023-04-01 02:40:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,8 +224,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-field-initializers")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c99 -fPIC -Werror -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c++${SC_CPP_VER} -fPIC -Werror -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c99 -fPIC -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c++${SC_CPP_VER} -fPIC -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Deal with Clang < 6.0's missing-braces issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/cub/CMakeLists.txt.orig    2023-04-01 02:19:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/cub/CMakeLists.txt 2023-04-01 02:41:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +119,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(CUB_TREAT_FILE_AS_CXX "/TP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  append_option_if_available("-Werror" CUB_CXX_WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   append_option_if_available("-Wall" CUB_CXX_WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   append_option_if_available("-Wextra" CUB_CXX_WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   append_option_if_available("-Winit-self" CUB_CXX_WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake.orig       2023-04-01 02:21:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake    2023-04-01 02:43:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,13 +82,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_rtti_flags "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake.orig   2023-04-01 02:19:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake        2023-04-01 02:45:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,13 +82,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_rtti_flags "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt.orig  2023-04-01 02:20:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt       2023-04-01 02:49:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_VISIBILITY_PRESET hidden)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(DCGM_CXX_FLAGS "-Werror -Wpedantic -Wno-sign-compare -Wno-unused-parameter -Wall -Wextra")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(DCGM_CXX_FLAGS "-Wpedantic -Wno-sign-compare -Wno-unused-parameter -Wall -Wextra")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(CheckCCompilerFlag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_c_compiler_flag("-Wno-cast-function-type" CC_HAS_WNO_CAST_FUNCTION_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,10 +83,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -g -O0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -g -O0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  -Werror -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -s -O3 -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s -O3 -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -s -O3 -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt.orig   2023-04-01 02:20:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt        2023-04-01 02:50:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt.orig   2023-04-01 02:20:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt        2023-04-01 02:51:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_compile_options (-std=c++11 -Wall -Wextra -pedantic -Werror)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_compile_options (-std=c++11 -Wall -Wextra -pedantic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories (include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:20:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake      2023-04-01 02:52:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,13 +82,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_rtti_flags "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/googletest/googletest/cmake/internal_utils.cmake.orig      2023-04-01 02:19:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/googletest/googletest/cmake/internal_utils.cmake   2023-04-01 02:56:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,13 +84,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Ensure MSVC treats source files as UTF-8 encoded.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_base_flags "${cxx_base_flags} -utf-8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_no_rtti_flags "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/flatbuffers/CMakeLists.txt.orig    2023-04-01 02:19:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/flatbuffers/CMakeLists.txt 2023-04-01 02:57:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,7 +264,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif(CYGWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Wno-unused-parameter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unused-parameter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Werror=unused-private-field") # enable warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -750,4 +750,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Include for running Google Benchmarks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(FLATBUFFERS_BUILD_BENCHMARKS AND CMAKE_VERSION VERSION_GREATER 3.13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   add_subdirectory(benchmarks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:20:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake      2023-04-01 02:59:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/patch-glog-init-check.diff b/python/py-pytorch/files/patch-glog-init-check.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 944c472191f..0f5f80f0ff2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/files/patch-glog-init-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/patch-glog-init-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@
</span> #
 # -CNielsen 2022-02-16
 #==============================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- .//c10/util/Logging.cpp     2022-07-17 07:08:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .//c10/util/Logging.cpp        2022-07-17 07:13:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- c10/util/Logging.cpp   2022-07-17 07:08:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ c10/util/Logging.cpp   2022-07-17 07:13:34.000000000 -0400
</span> @@ -192,23 +192,13 @@
      google::GLOG_WARNING,
      "The minimum log level that caffe2 will output.");
</pre><pre style='margin:0'>

</pre>