misc/glow: Update g20200115 -> g20200721

4 files changed, 94 insertions, 16 deletions

diff --git a/misc/glow/Makefile b/misc/glow/Makefile
index 34e030e6270e..34dfbe2f1ff2 100644
--- a/misc/glow/Makefile
+++ b/misc/glow/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	glow
-DISTVERSION=	g20200115
-PORTREVISION=	3
+DISTVERSION=	g20200721
 CATEGORIES=	misc # machine-learning
 PKGNAMESUFFIX=	-nn-compiler
 
@@ -15,28 +14,38 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_i386=	non-constant-expression cannot be narrowed from type 'dim_t', see https://github.com/pytorch/glow/issues/4024
 
 LIB_DEPENDS=	libLLVM-${LLVM_VER:R}.so:devel/llvm${LLVM_VER:S/.//} \
+		libboost_system.so:devel/boost-libs \
+		libdouble-conversion.so:devel/double-conversion \
+		libevent.so:devel/libevent \
+		libfolly.so:devel/folly \
 		libglog.so:devel/glog \
-		libprotobuf.so:devel/protobuf
+		libpng.so:graphics/png \
+		libprotobuf.so:devel/protobuf \
+		libsnappy.so:archivers/snappy \
+		libsodium.so:security/libsodium
 
 USES=		cmake compiler:c++14-lang python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	pytorch
-GH_TAGNAME=	97f84e830404183375380842de914e07c0961f7f
+GH_TAGNAME=	f24d960e3cc80db95ac0bc17b1900dbf60ca044a
 GH_TUPLE=	\
 		google:benchmark:090faec:googlebenchmark/tests/googlebenchmark \
-		google:googletest:0c799d0:googletest/tests/googletest \
 		houseroad:foxi:8015abb:foxi/thirdparty/foxi \
 		Maratyszcza:FP16:34d4bf0:fp16/thirdparty/fp16 \
 		onnx:onnx:50dc186:onnx/thirdparty/onnx \
 		stp:OutputCheck:eab62a5:OutputCheck/tests/OutputCheck
 
 CMAKE_ARGS=	-DFREEBSD_LLVM_VERSION:STRING=${LLVM_VER} -DGIT_SHA1:STRING="\"${GH_TAGNAME}\"" -DGIT_DATE:STRING="\"${DISTVERSION:S/g//}\""
+#CMAKE_ON=	BUILD_SHARED_LIBS # this causes build failure: undefined reference to llvm::cfg::Update<llvm::BasicBlock*>::dump() const
 CMAKE_OFF=	GLOW_BUILD_EXAMPLES GLOW_BUILD_TESTS
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 LLVM_VER=	${LLVM_DEFAULT:C/(.)(.)/\1.\2/}
 
+post-configure: # not sure what causes -lgflags_shared to appear in build.ninja
+	@${REINPLACE_CMD} -e 's|-lgflags_shared|-L${LOCALBASE}/lib -lgflags|g' ${BUILD_WRKSRC}/build.ninja
+
 do-install: # https://github.com/pytorch/glow/issues/3461
 		cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}
 		cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} glow ${STAGEDIR}${PREFIX}/include
diff --git a/misc/glow/distinfo b/misc/glow/distinfo
index 604a199e18a7..379036638545 100644
--- a/misc/glow/distinfo
+++ b/misc/glow/distinfo
@@ -1,10 +1,8 @@
-TIMESTAMP = 1579129746
-SHA256 (pytorch-glow-g20200115-97f84e830404183375380842de914e07c0961f7f_GH0.tar.gz) = 4b7913108b8ccf4191a504be31519a472807a37d17e3ee6ef3e9fd6f7529bff2
-SIZE (pytorch-glow-g20200115-97f84e830404183375380842de914e07c0961f7f_GH0.tar.gz) = 47971229
+TIMESTAMP = 1595389132
+SHA256 (pytorch-glow-g20200721-f24d960e3cc80db95ac0bc17b1900dbf60ca044a_GH0.tar.gz) = 1cb265b9d000a096360c5a5f452bf5080ea939dda6781f700eba4151045de749
+SIZE (pytorch-glow-g20200721-f24d960e3cc80db95ac0bc17b1900dbf60ca044a_GH0.tar.gz) = 48551013
 SHA256 (google-benchmark-090faec_GH0.tar.gz) = 0699cf1ac5ef31ebc15ded60329ca8b90cf0b4ae75c18eaf7300fe8a4c914a0f
 SIZE (google-benchmark-090faec_GH0.tar.gz) = 150159
-SHA256 (google-googletest-0c799d0_GH0.tar.gz) = f102915c9507f4f6ef87131892b090e4df9d41fae157ac6b0d76c84c8e84d3b2
-SIZE (google-googletest-0c799d0_GH0.tar.gz) = 992346
 SHA256 (houseroad-foxi-8015abb_GH0.tar.gz) = 07dc191ef38426617e6180e795fb3e3c5bf122445804003afa213dd762269213
 SIZE (houseroad-foxi-8015abb_GH0.tar.gz) = 28531
 SHA256 (Maratyszcza-FP16-34d4bf0_GH0.tar.gz) = e8d1f7190aaa9a2bedb92620c5b2e93529be3be37dd1f0c23e741cbef18365b2
diff --git a/misc/glow/files/patch-CMakeLists.txt b/misc/glow/files/patch-CMakeLists.txt
index 3d543adb0c1a..ddf86a4a6117 100644
--- a/misc/glow/files/patch-CMakeLists.txt
+++ b/misc/glow/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2020-01-15 20:28:56 UTC
+--- CMakeLists.txt.orig	2020-07-22 01:12:44 UTC
 +++ CMakeLists.txt
-@@ -151,7 +151,7 @@ endif ()
+@@ -173,7 +173,7 @@ endif ()
  # Top level setup for external backends
  ExternalBackendsInit()
  
@@ -9,3 +9,50 @@
  if(NOT LLVM_FOUND OR LLVM_VERSION VERSION_LESS 7.0)
    message(SEND_ERROR "LLVM >= 7.0 is required to build Glow")
  endif()
+@@ -186,7 +186,7 @@ if(NOT EXISTS "${GLOW_SOURCE_DIR}/tests/googlebenchmar
+   message(FATAL_ERROR "No googlebenchmark git submodule. Run: git submodule update --init --recursive")
+ endif()
+ 
+-if(NOT EXISTS "${GLOW_SOURCE_DIR}/tests/googletest/googletest")
++if(FALSE AND NOT EXISTS "${GLOW_SOURCE_DIR}/tests/googletest/googletest")
+   message(FATAL_ERROR "No googletest git submodule. Run: git submodule update --init --recursive")
+ endif()
+ 
+@@ -207,11 +207,11 @@ if(NOT EXISTS "${GLOW_THIRDPARTY_DIR}/fp16")
+ else()
+   include_directories(${GLOW_THIRDPARTY_DIR}/fp16/include)
+ endif()
+-if (MSVC)
++if (TRUE OR MSVC)
+     find_package(folly CONFIG REQUIRED)
+-    find_library(JEMALLOC_LIB jemalloc)
++    #find_library(JEMALLOC_LIB jemalloc)
+     add_library(folly_jemalloc INTERFACE)
+-    target_link_libraries(folly_jemalloc INTERFACE Folly::folly Folly::folly_deps Folly::follybenchmark Folly::folly_test_util ${JEMALLOC_LIB})
++    target_link_libraries(folly_jemalloc INTERFACE Folly::folly Folly::folly_deps Folly::follybenchmark Folly::folly_test_util)
+ elseif(NOT EXISTS "${GLOW_THIRDPARTY_DIR}/folly/folly")
+   message(FATAL_ERROR "No folly git submodule. Run: git submodule update --init --recursive")
+ else()
+@@ -231,15 +231,15 @@ else()
+   endif()
+   set(SAVE_CMAKE_CXX_STANDARD "${CMAKE_CXX_STANDARD}")
+   unset(CMAKE_CXX_STANDARD)
+-  set(CXX_STD "c++14" CACHE STRING "Force c++14 for folly")
+-  set(COMPILER_HAS_F_ALIGNED_NEW OFF CACHE BOOL "turn off -faligned_new for folly")
+-  add_subdirectory("${GLOW_THIRDPARTY_DIR}/folly" EXCLUDE_FROM_ALL)
+-  target_include_directories(folly PUBLIC "${OPENSSL_INCLUDE_DIR}")
++  #set(CXX_STD "c++14" CACHE STRING "Force c++14 for folly")
++  #set(COMPILER_HAS_F_ALIGNED_NEW OFF CACHE BOOL "turn off -faligned_new for folly")
++  #add_subdirectory("${GLOW_THIRDPARTY_DIR}/folly" EXCLUDE_FROM_ALL)
++  #target_include_directories(folly PUBLIC "${OPENSSL_INCLUDE_DIR}")
+   set(CMAKE_CXX_FLAGS "${SAVE_CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_STANDARD "${SAVE_CMAKE_CXX_STANDARD}")
+-  find_library(JEMALLOC_LIB jemalloc)
+-  add_library(folly_jemalloc INTERFACE)
+-  target_link_libraries(folly_jemalloc INTERFACE folly ${JEMALLOC_LIB})
++  #find_library(JEMALLOC_LIB jemalloc)
++  #add_library(folly_jemalloc INTERFACE)
++  #target_link_libraries(folly_jemalloc INTERFACE folly ${JEMALLOC_LIB})
+ endif()
+ 
+ add_library(Miniz
diff --git a/misc/glow/pkg-plist b/misc/glow/pkg-plist
index 35c5fd573563..2ac5908ea1b5 100644
--- a/misc/glow/pkg-plist
+++ b/misc/glow/pkg-plist
@@ -10,6 +10,8 @@ include/glow/AutoGenInstr.h
 include/glow/AutoGenNodes.cpp
 include/glow/AutoGenNodes.def
 include/glow/AutoGenNodes.h
+include/glow/AutoGenNodesExport.h
+include/glow/AutoGenNodesImport.h
 include/glow/Backend/Backend.h
 include/glow/Backend/BackendUtils.h
 include/glow/Backend/CompiledFunction.h
@@ -25,13 +27,12 @@ include/glow/Base/DeviceTensorTransferManager.h
 include/glow/Base/DimType.h
 include/glow/Base/IO.h
 include/glow/Base/Image.h
-include/glow/Base/SharedMutex.h
 include/glow/Base/TaggedList.h
 include/glow/Base/Tensor.h
+include/glow/Base/TensorSerialization.h
 include/glow/Base/Train.h
 include/glow/Base/Traits.h
 include/glow/Base/Type.h
-include/glow/CPU/libjit_bc.inc
 include/glow/CPUSpecificInstrsVerification.h
 include/glow/CPUSpecificNodesVerification.h
 include/glow/CodeGen/MemoryAllocator.h
@@ -66,22 +67,32 @@ include/glow/Importer/CommonOperatorLoader.h
 include/glow/Importer/ONNXIFIModelLoader.h
 include/glow/Importer/ONNXModelLoader.h
 include/glow/Importer/ProtobufLoader.h
+include/glow/Importer/TFLiteModelLoader.h
 include/glow/InstrGenIncludes.h
 include/glow/LLVMIRCodeGen/AllocationsInfo.h
 include/glow/LLVMIRCodeGen/GlowJIT.h
+include/glow/LLVMIRCodeGen/JITFilePrinter.h
 include/glow/LLVMIRCodeGen/LLVMBackend.h
 include/glow/LLVMIRCodeGen/LLVMCompiledFunction.h
 include/glow/LLVMIRCodeGen/LLVMIRGen.h
 include/glow/NodeGenIncludes.h
+include/glow/ONNXModelWriterIncludes.h
 include/glow/Optimizer/GraphOptimizer/CompilationContext.h
 include/glow/Optimizer/GraphOptimizer/FunctionPass.h
+include/glow/Optimizer/GraphOptimizer/FunctionPassManager.h
+include/glow/Optimizer/GraphOptimizer/FunctionPassPipeline.h
 include/glow/Optimizer/GraphOptimizer/FunctionPasses.def
 include/glow/Optimizer/GraphOptimizer/FunctionPasses.h
 include/glow/Optimizer/GraphOptimizer/GraphOptimizer.h
-include/glow/Optimizer/GraphOptimizer/PassManager.h
+include/glow/Optimizer/GraphOptimizer/NodeSplitting.h
 include/glow/Optimizer/GraphOptimizer/TrainingPreparation.h
-include/glow/Optimizer/GraphOptimizerPipeline/Pipeline.h
+include/glow/Optimizer/IROptimizer/CommandLine.h
+include/glow/Optimizer/IROptimizer/IRFunctionPass.h
+include/glow/Optimizer/IROptimizer/IRFunctionPassManager.h
+include/glow/Optimizer/IROptimizer/IRFunctionPassPipeline.h
+include/glow/Optimizer/IROptimizer/IRFunctionPasses.h
 include/glow/Optimizer/IROptimizer/IROptimizer.h
+include/glow/Optimizer/IROptimizer/IRPasses.def
 include/glow/Optimizer/Lower/Lower.h
 include/glow/Partitioner/Partitioner.h
 include/glow/Partitioner/PartitionerBase.h
@@ -89,17 +100,27 @@ include/glow/Partitioner/PartitionerOptimizer.h
 include/glow/Partitioner/PartitionerTypes.h
 include/glow/Partitioner/PartitionerUtils.h
 include/glow/Partitioner/PartitionerValidation.h
+include/glow/PassManager/Pass.h
+include/glow/PassManager/PassConfig.h
+include/glow/PassManager/PassConfigUtils.h
+include/glow/PassManager/PassManager.h
+include/glow/PassManager/Pipeline.h
 include/glow/Quantization/Base/Base.h
+include/glow/Quantization/Base/Calibration.h
 include/glow/Quantization/Base/Profile.h
 include/glow/Quantization/Quantization.h
 include/glow/Quantization/Serialization.h
 include/glow/Runtime/DeferredWeightLoader.h
+include/glow/Runtime/DeviceHealthMonitor.h
 include/glow/Runtime/Executor/Executor.h
+include/glow/Runtime/Executor/NetworkExecutionState.h
 include/glow/Runtime/Executor/ThreadPoolExecutor.h
 include/glow/Runtime/HostManager/HostManager.h
 include/glow/Runtime/Provisioner/Provisioner.h
+include/glow/Runtime/RequestData.h
 include/glow/Runtime/RuntimeTypes.h
 include/glow/Runtime/StatsExporter.h
+include/glow/Support/BFloat16.h
 include/glow/Support/Compiler.h
 include/glow/Support/Debug.h
 include/glow/Support/Error.h
@@ -112,6 +133,7 @@ include/glow/Support/TensorPool.h
 include/glow/Support/ThreadPool.h
 include/glow/Support/ZipUtils.h
 include/glow/Testing/StrCheck.h
+include/glow/libjit/libjit_cpu.inc
 lib/libBackend.a
 lib/libBackends.a
 lib/libBase.a
@@ -129,6 +151,7 @@ lib/libGraphOptimizerPipeline.a
 lib/libHostManager.a
 lib/libIR.a
 lib/libIROptimizer.a
+lib/libIROptimizerPipeline.a
 lib/libImporter.a
 lib/libInterpreter.a
 lib/libLLVMIRCodeGen.a
@@ -136,6 +159,7 @@ lib/libLower.a
 lib/libMemberType.a
 lib/libMiniz.a
 lib/libPartitioner.a
+lib/libPassManager.a
 lib/libProvisioner.a
 lib/libQuantization.a
 lib/libQuantizationBase.a