Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
eaeb0a4
[ML] PyTorch Inference App (#1638)
davidkyle Jan 12, 2021
ad6dbe1
[ML] Adjusting macOS build instructions for PyTorch (#1685)
droberts195 Jan 21, 2021
3e23336
[ML] Build setup instructions and tweaks for Torch on Windows (#1677)
droberts195 Jan 21, 2021
5b0ef6f
Merge branch 'master' into feature/pytorch-inference
droberts195 Jan 21, 2021
3e5d929
[ML] Add PyTorch setup instructions for Linux (#1688)
davidkyle Jan 21, 2021
3254e0c
Merge branch 'master' into feature/pytorch-inference
davidkyle Jan 24, 2021
ed19689
[ML] Add libtorch Linux DockerFile (#1678)
davidkyle Jan 25, 2021
864cdce
[ML] Improving PyTorch build on Windows (#1692)
droberts195 Jan 25, 2021
69cf46d
Use Eigen BLAS library when building PyTorch for Linux (#1696)
davidkyle Jan 25, 2021
b0894e7
[ML] Windows adjustments for PyTorch (#1697)
droberts195 Jan 26, 2021
056131d
[ML] Remove mkl dependency and improve docker cleanup (#1712)
davidkyle Jan 29, 2021
0c4213c
Merge branch 'master' into feature/pytorch-inference
davidkyle Feb 5, 2021
72d8fdd
[ML] Build libtorch for Linux aarch64 (#1714)
davidkyle Feb 8, 2021
66e23e7
Increment version for the docker builder file and build scripts for …
davidkyle Feb 10, 2021
ec31165
Updating macOS Docker image (#1738)
droberts195 Feb 10, 2021
4d2a4fb
Merge branch 'master' into feature/pytorch-inference
droberts195 Feb 11, 2021
34a82a9
[ML] Add pytorch_inference to Makefile and controller (#1739)
droberts195 Feb 11, 2021
ef4440a
[ML] Delete temp files created by evaluate.py (#1740)
davidkyle Feb 17, 2021
574b1b5
Merge branch 'master' into feature/pytorch-inference
droberts195 Feb 19, 2021
450353e
Merge branch 'master' into feature/pytorch-inference
davidkyle Feb 24, 2021
3ab6f07
[ML] PyTorch Command Processor (#1770)
davidkyle Mar 2, 2021
04498ba
Merge branch 'master' into feature/pytorch-inference
davidkyle Mar 2, 2021
58b95a1
[ML] Use TESTED_OBJS dependency in PyTorch unittest makefile (#1786)
davidkyle Mar 9, 2021
51e1470
[ML] Upgrading to PyTorch 1.8.0 on macOS (#1795)
droberts195 Mar 10, 2021
d5af314
[ML] Upgrading to PyTorch 1.8.0 on Windows (#1796)
droberts195 Mar 15, 2021
4a466c2
[ML] Rename pytorch log pipe arg (#1799)
dimitris-athanasiou Mar 16, 2021
046369f
[ML] Upgrading to PyTorch 1.8.0 on Linux (#1797)
droberts195 Mar 17, 2021
d9a30b4
Merge branch 'master' into feature/pytorch-inference
droberts195 Mar 17, 2021
6f1a416
[ML] Add PyTorch license to repo (#1816)
droberts195 Mar 17, 2021
d2834b3
[ML] Handle validation errors in PyTorch requests (#1818)
davidkyle Mar 22, 2021
2a44ffb
[ML] Add ability to evaluate a simple PyTorch model (#1817)
davidkyle Mar 23, 2021
7c85298
[ML] PyTorch results should be written as an array (#1841)
dimitris-athanasiou Apr 2, 2021
fabc3b7
Merge branch 'master' into feature/pytorch-inference
droberts195 Apr 6, 2021
3a3f07b
Merge branch 'master' into feature/pytorch-inference
davidkyle Apr 6, 2021
e3d03f9
Parse inference results from an array (#1843)
davidkyle Apr 6, 2021
add502b
Merge branch 'master' into feature/pytorch-inference
davidkyle May 24, 2021
26f9aff
Add changelog comment
davidkyle May 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 49 additions & 3 deletions 3rd_party/3rd_party.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ case `uname` in
BOOST_LIBRARIES='atomic chrono date_time filesystem iostreams log log_setup program_options regex system thread'
XML_LOCATION=
GCC_RT_LOCATION=
OMP_LOCATION=
STL_LOCATION=
ZLIB_LOCATION=
TORCH_LIBRARIES="torch_cpu c10"
TORCH_LOCATION=/usr/local/lib
TORCH_EXTENSION=.dylib
;;

Linux)
Expand All @@ -65,10 +69,15 @@ case `uname` in
XML_EXTENSION=.so.2
GCC_RT_LOCATION=/usr/local/gcc93/lib64
GCC_RT_EXTENSION=.so.1
OMP_LOCATION=/usr/local/gcc93/lib64
OMP_EXTENSION=.so.1
STL_LOCATION=/usr/local/gcc93/lib64
STL_PATTERN=libstdc++
STL_EXTENSION=.so.6
ZLIB_LOCATION=
ZLIB_LOCATION=
TORCH_LIBRARIES="torch_cpu c10"
TORCH_LOCATION=/usr/local/gcc93/lib
TORCH_EXTENSION=.so
elif [ "$CPP_CROSS_COMPILE" = macosx ] ; then
SYSROOT=/usr/local/sysroot-x86_64-apple-macosx10.14
BOOST_LOCATION=$SYSROOT/usr/local/lib
Expand All @@ -77,8 +86,12 @@ case `uname` in
BOOST_LIBRARIES='atomic chrono date_time filesystem iostreams log log_setup program_options regex system thread'
XML_LOCATION=
GCC_RT_LOCATION=
OMP_LOCATION=
STL_LOCATION=
ZLIB_LOCATION=
TORCH_LIBRARIES="torch_cpu c10"
TORCH_LOCATION=$SYSROOT/usr/local/lib
TORCH_EXTENSION=.dylib
else
SYSROOT=/usr/local/sysroot-$CPP_CROSS_COMPILE-linux-gnu
BOOST_LOCATION=$SYSROOT/usr/local/gcc93/lib
Expand All @@ -95,6 +108,7 @@ case `uname` in
XML_EXTENSION=.so.2
GCC_RT_LOCATION=$SYSROOT/usr/local/gcc93/lib64
GCC_RT_EXTENSION=.so.1
OMP_LOCATION=$SYSROOT/usr/local/gcc93/lib64
STL_LOCATION=$SYSROOT/usr/local/gcc93/lib64
STL_PREFIX=libstdc++
STL_EXTENSION=.so.6
Expand All @@ -115,6 +129,7 @@ case `uname` in
XML_LOCATION=/$LOCAL_DRIVE/usr/local/bin
XML_EXTENSION=.dll
GCC_RT_LOCATION=
OMP_LOCATION=
# Read VCBASE from environment if defined, otherwise default to VS Professional 2019
DEFAULTVCBASE=`cd /$LOCAL_DRIVE && cygpath -m -s "Program Files (x86)/Microsoft Visual Studio/2019/Professional"`
VCBASE=${VCBASE:-$DEFAULTVCBASE}
Expand All @@ -124,6 +139,9 @@ case `uname` in
STL_EXTENSION=.dll
ZLIB_LOCATION=/$LOCAL_DRIVE/usr/local/bin
ZLIB_EXTENSION=1.dll
TORCH_LIBRARIES="asmjit c10 fbgemm torch_cpu"
TORCH_LOCATION=/$LOCAL_DRIVE/usr/local/bin
TORCH_EXTENSION=.dll
;;

*)
Expand Down Expand Up @@ -176,6 +194,18 @@ if [ ! -z "$GCC_RT_LOCATION" ] ; then
exit 7
fi
fi
if [ ! -z "$OMP_LOCATION" ] ; then
if ls $OMP_LOCATION/libgomp*$OMP_EXTENSION >/dev/null ; then
if [ -n "$INSTALL_DIR" ] ; then
rm -f $INSTALL_DIR/libgomp*$OMP_EXTENSION
cp $OMP_LOCATION/libgomp*$OMP_EXTENSION $INSTALL_DIR
chmod u+wx $INSTALL_DIR/libgomp*$OMP_EXTENSION
fi
else
echo "OMP runtime library not found"
exit 8
fi
fi
if [ ! -z "$STL_LOCATION" ] ; then
if ls $STL_LOCATION/*$STL_PATTERN*$STL_EXTENSION >/dev/null ; then
if [ -n "$INSTALL_DIR" ] ; then
Expand All @@ -185,7 +215,7 @@ if [ ! -z "$STL_LOCATION" ] ; then
fi
else
echo "C++ standard library not found"
exit 8
exit 9
fi
fi
if [ ! -z "$ZLIB_LOCATION" ] ; then
Expand All @@ -197,9 +227,25 @@ if [ ! -z "$ZLIB_LOCATION" ] ; then
fi
else
echo "zlib not found"
exit 9
exit 10
fi
fi
if [ ! -z "$TORCH_LOCATION" ] ; then
if ls $TORCH_LOCATION/*$TORCH_EXTENSION >/dev/null ; then
if [ -n "$INSTALL_DIR" ] ; then
for LIBRARY in $TORCH_LIBRARIES
do
rm -f $INSTALL_DIR/*$LIBRARY*$TORCH_EXTENSION
cp $TORCH_LOCATION/*$LIBRARY*$TORCH_EXTENSION $INSTALL_DIR
chmod u+wx $INSTALL_DIR/*$LIBRARY*$TORCH_EXTENSION
done
fi
else
echo "Torch libraries not found"
exit 11
fi
fi


# Special extra platform-specific processing
case `uname` in
Expand Down
2 changes: 2 additions & 0 deletions 3rd_party/licenses/pytorch-INFO.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name,version,revision,url,license,copyright,sourceURL
PyTorch,1.8.0,37c1f4a7fef115d719104e871d0cf39434aa9d56,https://pytorch.org,BSD-3-Clause,,
73 changes: 73 additions & 0 deletions 3rd_party/licenses/pytorch-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
From PyTorch:

Copyright (c) 2016- Facebook, Inc (Adam Paszke)
Copyright (c) 2014- Facebook, Inc (Soumith Chintala)
Copyright (c) 2011-2014 Idiap Research Institute (Ronan Collobert)
Copyright (c) 2012-2014 Deepmind Technologies (Koray Kavukcuoglu)
Copyright (c) 2011-2012 NEC Laboratories America (Koray Kavukcuoglu)
Copyright (c) 2011-2013 NYU (Clement Farabet)
Copyright (c) 2006-2010 NEC Laboratories America (Ronan Collobert, Leon Bottou, Iain Melvin, Jason Weston)
Copyright (c) 2006 Idiap Research Institute (Samy Bengio)
Copyright (c) 2001-2004 Idiap Research Institute (Ronan Collobert, Samy Bengio, Johnny Mariethoz)

From Caffe2:

Copyright (c) 2016-present, Facebook Inc. All rights reserved.

All contributions by Facebook:
Copyright (c) 2016 Facebook Inc.

All contributions by Google:
Copyright (c) 2015 Google Inc.
All rights reserved.

All contributions by Yangqing Jia:
Copyright (c) 2015 Yangqing Jia
All rights reserved.

All contributions by Kakao Brain:
Copyright 2019-2020 Kakao Brain

All contributions from Caffe:
Copyright(c) 2013, 2014, 2015, the respective contributors
All rights reserved.

All other contributions:
Copyright(c) 2015, 2016 the respective contributors
All rights reserved.

Caffe2 uses a copyright model similar to Caffe: each contributor holds
copyright over their contributions to Caffe2. The project versioning records
all such contribution and copyright details. If a contributor wants to further
mark their specific copyright on a particular contribution, they should
indicate their copyright solely in the commit message of the change when it is
committed.

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. Neither the names of Facebook, Deepmind Technologies, NYU, NEC Laboratories America
and IDIAP Research Institute nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Loading