From cc73d30287d63a25c77597e0938bff6563804cdd Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 6 May 2017 04:35:15 +0000 Subject: [PATCH] - Update to 1.0 PR: 218785 Submitted by: maintainer --- graphics/caffe/Makefile | 6 +++--- graphics/caffe/distinfo | 6 +++--- graphics/caffe/pkg-plist | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile index 660803f066d5..9a437b916fec 100644 --- a/graphics/caffe/Makefile +++ b/graphics/caffe/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= caffe -PORTVERSION= 1.0.0.r5 -PORTREVISION= 3 +PORTVERSION= 1.0 CATEGORIES= graphics MAINTAINER= eric@camachat.org @@ -11,6 +10,8 @@ COMMENT= Fast open framework for deep learning LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +CONFLICTS_INSTALL= caffe2-* + BUILD_DEPENDS= ${PYNUMPY} \ ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/include/cblas.h:math/cblas \ @@ -49,7 +50,6 @@ PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} DATADIR=${DATADIR} GH_ACCOUNT= BVLC USE_GITHUB= yes -GH_TAGNAME= rc5 post-extract: @${CP} -v ${.CURDIR}/files/Makefile.config ${WRKSRC}/ diff --git a/graphics/caffe/distinfo b/graphics/caffe/distinfo index acfe6b1ef7ba..74de1e4929ee 100644 --- a/graphics/caffe/distinfo +++ b/graphics/caffe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489879004 -SHA256 (BVLC-caffe-1.0.0.r5-rc5_GH0.tar.gz) = 06592aa8f5254335df3e244dafacc15765e2c60479b4bf2e7c887e8e023802fb -SIZE (BVLC-caffe-1.0.0.r5-rc5_GH0.tar.gz) = 8505332 +TIMESTAMP = 1492721930 +SHA256 (BVLC-caffe-1.0_GH0.tar.gz) = 71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f +SIZE (BVLC-caffe-1.0_GH0.tar.gz) = 8511397 diff --git a/graphics/caffe/pkg-plist b/graphics/caffe/pkg-plist index 1ba2eb0e2be7..3fa51214ad7a 100644 --- a/graphics/caffe/pkg-plist +++ b/graphics/caffe/pkg-plist @@ -15,7 +15,7 @@ bin/convert_mnist_data bin/upgrade_net_proto_binary bin/extract_features lib/libcaffe.a -lib/libcaffe.so.1.0.0-rc5 +lib/libcaffe.so.1.0.0 lib/libcaffe.so include/caffe/blob.hpp include/caffe/layer.hpp @@ -136,9 +136,11 @@ include/caffe/test/test_caffe_main.hpp %%PYTHON_SITELIBDIR%%/caffe/test/test_net.py %%PYTHON_SITELIBDIR%%/caffe/test/test_python_layer_with_param_str.py %%PYTHON_SITELIBDIR%%/caffe/test/test_net_spec.py +%%PYTHON_SITELIBDIR%%/caffe/test/test_nccl.py %%PYTHON_SITELIBDIR%%/caffe/test/test_io.py %%PYTHON_SITELIBDIR%%/caffe/test/test_python_layer.py %%PYTHON_SITELIBDIR%%/caffe/test/test_layer_type_list.py +%%PYTHON_SITELIBDIR%%/caffe/test/test_draw.py %%PYTHON_SITELIBDIR%%/caffe/test/test_coord_map.py %%PYTHON_SITELIBDIR%%/caffe/net_spec.py %%PYTHON_SITELIBDIR%%/caffe/classifier.py