Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Continuing the drive to TF2 #110

Merged
merged 81 commits into from
Apr 12, 2021
Merged
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
4316bd3
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.3, and con…
Jun 23, 2020
9460660
Update to 2.2.0
jschueller Jun 23, 2020
bd05923
deps
jschueller Jun 23, 2020
dfba61f
Remove build_pkg scripts
jschueller Jun 23, 2020
6c2d236
cleanuos
jschueller Jun 23, 2020
393fdfb
entrypoints
jschueller Jun 23, 2020
f1a46ed
disable xla
jschueller Jun 24, 2020
d26eab8
llvm
jschueller Jun 24, 2020
300bee8
debug
jschueller Jun 24, 2020
c0e6e8c
debug
jschueller Jun 24, 2020
db5be3a
nasm
jschueller Jun 24, 2020
b34ad77
debug
jschueller Jun 24, 2020
dfac069
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.4, and con…
Jul 6, 2020
89d9dec
Fix tests
marcelotrevisani Jul 6, 2020
f621e30
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.4, and con…
marcelotrevisani Jul 6, 2020
976c487
Merge branch '220' of https://github.com/jschueller/tensorflow-feedst…
marcelotrevisani Jul 6, 2020
5e3337f
Remove pinned compiler
marcelotrevisani Jul 6, 2020
3d1221c
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.4, and con…
marcelotrevisani Jul 6, 2020
5ade020
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
Nov 13, 2020
5e7349a
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
Dec 1, 2020
8937c9e
Merge remote-tracking branch 'upstream/master' into tf2
h-vetinari Jan 11, 2021
f339994
MNT: Re-rendered with conda-build 3.21.1, conda-smithy 3.8.6, and con…
h-vetinari Jan 11, 2021
2ac1247
clean up patches
h-vetinari Jan 11, 2021
c7a021b
move old patches out of the way
h-vetinari Jan 11, 2021
94bd4c8
use bazel from conda-forge
h-vetinari Jan 11, 2021
5a4628e
remove some upper version limits
h-vetinari Jan 11, 2021
97404d9
align some selectors
h-vetinari Jan 11, 2021
ae2734d
repin bazel
h-vetinari Jan 11, 2021
65b6648
update the script for libtensorflow_cc
njzjz Jan 12, 2021
afcc7a7
regenerate llvm.BUILD and refactor patches to do this more easily whe…
h-vetinari Jan 11, 2021
992a52b
let's build from source everywhere
h-vetinari Jan 14, 2021
c88dd32
remove (a-priori) unnecessary selectors
h-vetinari Jan 14, 2021
55b17a0
bump to 2.4.0
h-vetinari Jan 14, 2021
266a1ac
update dependencies for 2.4.0
h-vetinari Jan 14, 2021
5cec801
rebase patches for 2.4.0
h-vetinari Jan 14, 2021
eef6343
no distinction in build.sh between osx/linux
h-vetinari Jan 14, 2021
af5cef9
try adapting windows build script too
h-vetinari Jan 14, 2021
ffc86fd
Revert (morally speaking) "use bazel from conda-forge"
h-vetinari Jan 14, 2021
f62c375
use m2-versions of zip/unzip on windows
h-vetinari Jan 14, 2021
50b01bd
removed swig from TF_SYSTEM_LIBS to follow upstream
h-vetinari Jan 15, 2021
05a1f27
add curl on win
h-vetinari Jan 15, 2021
175b26b
add review suggestion to tell bazel about resource constraints
h-vetinari Jan 15, 2021
9cf3ad4
exclude pip_package from rsync in cp_libtensorflow_cc.sh
h-vetinari Jan 15, 2021
fb497d1
Revert "add review suggestion to tell bazel about resource constraints"
h-vetinari Jan 16, 2021
77c31fb
use bazel 3.1.0 from conda-forge
h-vetinari Jan 17, 2021
974331f
remove custom_clang_toolchain
h-vetinari Jan 17, 2021
cd460d8
fix libtensorflow
njzjz Feb 3, 2021
f02b37c
add files to outputs.tensorflow
njzjz Feb 3, 2021
b6cea1e
use python-flatbuffers
njzjz Feb 3, 2021
938d5b6
try to fix bugs
njzjz Feb 4, 2021
365f900
update tests; update build c lib scripts
njzjz Feb 4, 2021
74b7ff1
remove a test
njzjz Feb 4, 2021
4aafffa
tf2 has no sessions any more
njzjz Feb 4, 2021
9dc99bb
Add changes for osx-64
xhochy Mar 18, 2021
8d66d8d
Be kind to CI
xhochy Mar 18, 2021
d9345ed
Add osx-arm64
xhochy Mar 25, 2021
15f61b0
Copy over toolchain from bazel-feedstock
xhochy Mar 25, 2021
ba2f163
Use toolchain on Linux
xhochy Mar 26, 2021
a2c562a
Set target_cpu on osx-64 to darwin
xhochy Mar 27, 2021
8fcea56
Add @xhochy as a maintainer
xhochy Mar 27, 2021
b67c4b2
Use newer macOS SDK
xhochy Mar 27, 2021
628992c
Add pybind11 to TF_SYSTEMLIBS
xhochy Mar 27, 2021
c1d9651
Fix run_exports
xhochy Apr 1, 2021
bf41b09
Ensure compile tests really fail if they fail
xhochy Apr 1, 2021
753666d
Fix native osx-arm64 build
xhochy Apr 1, 2021
6ed5f3d
Linux builds passing
xhochy Apr 1, 2021
1a6be0d
Deactivate unused llvm patches
xhochy Apr 1, 2021
033a320
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
xhochy Apr 1, 2021
c30a4d7
Pin numpy, add cross-python
xhochy Apr 1, 2021
50efd4a
Use system libpng
xhochy Apr 1, 2021
998a671
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
xhochy Apr 1, 2021
0444030
Pin numpy to 1.19.2
xhochy Apr 1, 2021
f342611
Be less strict on build-numpy
xhochy Apr 1, 2021
a6baa76
Fix requirements for pip check
xhochy Apr 6, 2021
4733336
Re-add tensorflow meta package
xhochy Apr 8, 2021
4c49427
Remove unused patches
xhochy Apr 8, 2021
640d328
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.0, and co…
xhochy Apr 8, 2021
23d2097
sort TF_SYSTEM_LIBS before package requirements
h-vetinari Apr 8, 2021
b8876a1
remove outdated line in build.sh
h-vetinari Apr 8, 2021
743434a
turn diffs into patches
h-vetinari Apr 8, 2021
ee305da
align some selectors
h-vetinari Apr 8, 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
17 changes: 10 additions & 7 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

114 changes: 0 additions & 114 deletions .azure-pipelines/azure-pipelines-win.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,32 +1,57 @@
c_compiler:
- gcc
c_compiler_version:
- '5.4'
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '5.4'
- '9'
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
giflib:
- '5.2'
grpc_cpp:
- '1.36'
jpeg:
- '9'
libcurl:
- '7'
libpng:
- '1.6'
libprotobuf:
- '3.15'
openssl:
- 1.1.1
pin_run_as_build:
jpeg:
max_pin: x
libcurl:
max_pin: x
libpng:
max_pin: x.x
openssl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
zlib:
max_pin: x.x
python:
- 3.6.* *_cpython
snappy:
- '1'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,32 +1,57 @@
c_compiler:
- gcc
c_compiler_version:
- '5.4'
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '5.4'
- '9'
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
giflib:
- '5.2'
grpc_cpp:
- '1.36'
jpeg:
- '9'
libcurl:
- '7'
libpng:
- '1.6'
libprotobuf:
- '3.15'
openssl:
- 1.1.1
pin_run_as_build:
jpeg:
max_pin: x
libcurl:
max_pin: x
libpng:
max_pin: x.x
openssl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
zlib:
max_pin: x.x
python:
- 3.7.* *_cpython
snappy:
- '1'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
57 changes: 57 additions & 0 deletions .ci_support/linux_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
giflib:
- '5.2'
grpc_cpp:
- '1.36'
jpeg:
- '9'
libcurl:
- '7'
libpng:
- '1.6'
libprotobuf:
- '3.15'
openssl:
- 1.1.1
pin_run_as_build:
jpeg:
max_pin: x
libcurl:
max_pin: x
libpng:
max_pin: x.x
openssl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
zlib:
max_pin: x.x
python:
- 3.8.* *_cpython
snappy:
- '1'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
Loading