Commit graph

116 commits

Author SHA1 Message Date
Paul Jesse Hellemn
e323f02277 Fixing missing PyCObject_Type bug (#8467) 2018-06-14 08:08:25 -07:00
Yangqing Jia
56b1dcccf6
[cmake] deprecate caffe2_* specific cuda function in cmake. (#8200)
* deprecate caffe2_* specific cuda function in cmake.

* ENV{} -> $ENV{}

* CUDA_ARCH_NAME -> TORCH_CUDA_ARCH_LIST

* .

* .

* .
2018-06-06 14:13:26 -07:00
Paul Jesse Hellemn
fa1bdcf4d2
Pinning opencv to < 3.4 in conda builds (#7923)
* Pinning opencv to 3.1.0 in conda builds

* Also pinning numpy to 1.11

* Trying only specifying <3.4
2018-06-05 13:16:02 -07:00
Lu Fang
a890a0be07
Renanme ZFNet to ZFNet512 (#7723) 2018-05-21 11:37:39 +08:00
bddppq
3af3d13599
Run onnx integration tests in caffe2 CI (#7565)
* Run onnx integration tests in caffe2 CI

* verbose log

* turn off onnx verbose installation log

* can not install ninja

* Do not use all cores to build pytorch

* install tests require

* pip install to user dir

* use determined path to improve (s)ccache hit

* Do not change path in test.sh

* Add the compile cache hit trick to conda install as well

* cover jenkins in CI environment detection
2018-05-15 13:25:24 -07:00
bddppq
bf9676180f
Update the name of env var for triggering integrated conda build (#7557) 2018-05-14 16:28:39 -07:00
bddppq
cf9913d569
Install torchvision before running integration tests (#7552) 2018-05-14 11:49:10 -07:00
bddppq
141d81d095
Move ONNX integration tests from onnx-fb-universe to PyTorch repo (#7397)
* Move ONNX integration tests from onnx-fb-universe to PyTorch repo

* Switch to use torchvision

* Delete single rnn operator tests, they have been covered in e2e tests in test_caffe2.py

* Mirror the fix in onnx-fb-universe to bypass cuda check

667326d84b
2018-05-11 15:05:18 -07:00
Paul Jesse Hellemn
9396740406
Updating condas to build for all CUDA archs (#7379) 2018-05-08 11:45:45 -07:00
Bram Wasti
75dbf9b113 [caffe2][build] Update python cmake flag print script (#7306) 2018-05-08 00:34:42 -07:00
Paul Jesse Hellemn
0859f0e3e6
Pinning numpy version in conda builds (#7314) 2018-05-04 16:38:53 -07:00
Paul Jesse Hellemn
0259d9c8d3
Changing underscores to hypens in conda package names (#7299) 2018-05-04 12:50:41 -07:00
Paul Jesse Hellemn
1313791015
Need an explicit flag since opencv is on by default (#7225) 2018-05-02 21:00:34 -07:00
Paul Jesse Hellemn
d154d32890
Fix to a conda hack (#7212) 2018-05-02 17:35:15 -07:00
Paul Jesse Hellemn
8ac6856e54
Removing features for a sec (#7211) 2018-05-02 17:11:19 -07:00
Paul Jesse Hellemn
1ca6e77615
Fix to comput_70 error + some more lowercasing (#7205) 2018-05-02 15:34:35 -07:00
Paul Jesse Hellemn
4d2693973e
[Caffe2] Turning on ATEN for Caffe2 in integrated builds (#7169)
* Turning on ATEN for Caffe2 in integrated builds

* Adding slim version

* Fixing missing name suffix, fixing conda tests
2018-05-02 11:16:29 -07:00
Paul Jesse Hellemn
90026f59a3
Switching to conda's --no-test flag (#7099)
* Switching to conda's --no-test flag

* Also updating callsite in .jenkins/build.sh
2018-04-30 11:22:25 -07:00
Paul Jesse Hellemn
2a56666196
Removing leveldb to make special gcc builds unnecessary (#7098) 2018-04-30 10:55:37 -07:00
Paul Jesse Hellemn
fc6a846cc5
[Caffe2] Fixing bug in conda builds (#7061)
* Fixing bug in conda builds

* Update to other PR
2018-04-27 21:52:40 -07:00
Paul Jesse Hellemn
1048d0dd67
[Caffe2] Moving all conda package information into package name rather than build string (#7041)
* Lowercasing script internal variables

* Removing nccl from name
2018-04-27 21:42:49 -07:00
Paul Jesse Hellemn
902579602b
[wip] [Caffe2] Changes to integrated binaries (#6997)
* Changes to integrated binaries

* Changes for cpu version of integrated binary

* Disabling static linking of CUDA for pytorch for integrated builds
2018-04-26 15:43:24 -07:00
Paul Jesse Hellemn
8109b3065e
Slight changes to anaconda script (#6994) 2018-04-26 10:04:58 -05:00
Paul Jesse Hellemn
b038b3d7be
Always dumping final meta.yaml for debugging (#6977) 2018-04-25 19:00:24 -05:00
Lu Fang
8028162103
Update the script to avoid the protobuf lib issue and add ZFNet (#6966) 2018-04-25 16:38:43 -07:00
Paul Jesse Hellemn
2e32e8df75
Statically linking CUDA for Anaconda builds (#6680)
* Statically linking CUDA for Anaconda builds

* typo

* Adding a summary line

* Comments

* Typo fix

* Fix faulty parameter passing

* Removing problem CUDA modules for now

* Fixing unused debugging function

* Turning off static cuda linking until script changes are in

* Disabling mkl
2018-04-25 18:22:54 -05:00
bddppq
0d0dcde5a8 Fix caffe2 eigen + cuda9 windows build (#6746) 2018-04-22 09:36:09 -07:00
Lu Fang
db540c9e7b
Fix the bug in fb devgpu setup script (#6823)
* Update onnx_c2_setup.sh

* More fix
2018-04-20 15:15:41 -07:00
Paul Jesse Hellemn
ad8bfb7359
Adding package name parameter for conda builds (#6727) 2018-04-18 14:02:09 -07:00
なるみ
084e3a755b fix incorrect path (#6605) 2018-04-15 21:22:11 -07:00
Paul Jesse Hellemn
be86500244
Conda binary changes (#6534)
* Adding integrated pytorch-caffe2 package

* Updates

* Fixing more substitution

* Fix to pytorch build location

* Bugfixes, progress towards including CUDA libs in package

* Fix to sed call

* Putting off packaing CUDA libs for Caffe2

* Progress towards packaging CUDA libs

* Progress towards packaging CUDA libs

* Changes to CUDA copying

* Turning on CUDA lib packaging

* Correction to env variables passed into meta.yaml

* typo

* Adding more needed variables in build.sh

* Adding some debugging info

* Changing versioning to have dates and be in build string

* Removing version from build string

* Removing packaging CUDA logic for static linking (later)

* Changing version to mirror pytorch

* Removing env variable req in build.sh

* Change to sed to port to mac
2018-04-12 16:51:06 -07:00
Paul Jesse Hellemn
774601c04c
[Caffe2] Consolidating conda build scripts (#6359)
* Consolidating conda build scripts

* Grep bug

* Naming bug

* Correcting quoting of variable passing
2018-04-06 16:54:42 -07:00
Paul Jesse Hellemn
38b995a13b
Fixing conda test builds (#6261)
* Moving conda test package installs into docker image

* Small nits

* Onnx setup.py still needs PROTOBUF_INCDIR passed in
2018-04-05 13:27:43 -07:00
Paul Jesse Hellemn
4375dfd0b2 Changes without protoc conditions (#6142) 2018-04-03 09:50:14 -04:00
Lu Fang
80cf134aff Adjust the setup script according to the repo changes (#6218) 2018-04-03 09:44:52 -04:00
Orion Reblitz-Richardson
a409f959e8
Remove ShuffleNet from model zoo. (#6203)
* No longer supported.
2018-04-02 15:00:06 -07:00
bddppq
28e66705ff Move helper scripts to new repo (#6159) 2018-04-02 14:06:29 -04:00
Orion Reblitz-Richardson
368f96acde Remove tutorials from main repository.
* They now live at https://github.com/caffe2/tutorials
* Updating caffe2.ai website to match in a separate commit.
2018-03-29 09:31:09 -07:00
Paul Jesse Hellemn
02d5ae6c9b Removing verbose logging from windows (#2455) 2018-03-27 18:19:55 -07:00
Dmytro Dzhulgakov
e977825c01 Merge the conflicts 2018-03-27 18:10:39 -07:00
Orion Reblitz-Richardson
2017c9caef Add script for removing Apache header.
* Can be used to remove the license header added with add_apache_header.sh
2018-03-27 13:10:18 -07:00
Paul Jesse Hellemn
f393c90cda Moving conda/ to caffe2/conda (#2428)
* Moving conda/ to caffe2/conda

* fix

* Moving caffe2/conda to conda/caffe2
2018-03-27 07:48:23 -07:00
Marat Dukhan
44039ffcea Use -DCMAKE_BUILD_TYPE=Release for local build by default 2018-03-21 16:12:32 -04:00
Paul Jesse Hellemn
3f667176cc Fixing the conda-gcc-cuda builds (#2305)
* Fixing mistakes in earlier PR

* Allowing cuda builds of different gccs
2018-03-19 09:32:32 -07:00
Paul Jesse Hellemn
c18dba9fe7 Adding gcc4 conda builds (#2283)
* Changes without centos changes

* Changes for protobuf 3.5 and gcc 4.8

* Changing 3.4.1 back to 3.5.1

* Preventing installing two versions of setuptools

* Fixing setuptools bug
2018-03-17 17:26:37 -07:00
Paul Jesse Hellemn
74f0b270ea Fixing conda (#2123)
* Fixing conda

* Adding hypothesis and onnx to conda builds

* Updates but still not working

* Adding required changes to conda_full

* Updates

* Moving to more general build_anaconda script

* Adding check for gcc version

* Adding general ways to add/remove packages from meta.yaml?

* Changes for specific packages to build on gcc 5.4

* Fix with glog spec

* Requiring >numpy 1.12 for python 3 to satisfy opencv dependency

* Adding pydot to required testing packages

* Adding script to read conda versions for gcc ABI

* Trying to fix segfault by installing in env instead

* conda activate -> source activate

* Trying adding back leveldb

* Setting locale for ONNX + conda-search changed its format

* read_conda_versions handles libprotobuf

* Conda script updates

* Adding a protobuf-working test

* Removing changes to proto defs b/c they will require internal changes in a separate diff
2018-03-14 12:24:37 -07:00
Marat Dukhan
bbc2c642c9 Use Ninja build system when available
When Ninja is installed, use it instead of Make for native builds and for Android cross-builds.
2018-03-07 20:49:30 -05:00
Marat Dukhan
fc7ee0c941 Use NEON for Android build 2018-03-03 01:04:56 +01:00
Koan-Sin Tan
72d5d9016a move -s to CMakeLists.txt 2018-03-02 20:31:33 +01:00
Koan-Sin Tan
ca90d4c356 Add -s for Android back
Android libraries are statically linked, we'd better strip binaries
2018-03-02 20:31:33 +01:00