Skip to content

Commit 1961583

Browse files
committed
Build system refactoring #2
1 parent 5fe7108 commit 1961583

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ bin/*
22
VARIANT
33
BINDIR
44
deps/*
5-
!deps/bazel/
65
!deps/readies/
76
!deps/*.py
87
examples/js/node_modules/
98
examples/js/package-lock.json
109
/[0-9]*/
10+
*.tar.gz
11+
*.tgz
1112

1213
# Misc
1314
.DS_Store

build/libtorch-arm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ARG OS=ubuntu:bionic
1+
ARG OS=debian:stretch-slim
22

33
#----------------------------------------------------------------------------------------------
44
FROM ${OS}
55

66
# ARG ARCH=x64
7-
ARG PT_VER=v1.0.1
7+
ARG PT_VER=v1.1.0
88

99
RUN set -ex; apt-get update; apt-get install -y git
1010

build/libtorch-x64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG OS=ubuntu:bionic
1+
ARG OS=debian:stretch
22

33
#----------------------------------------------------------------------------------------------
44
FROM ${OS}
55

6-
ARG PT_VER=v1.0.1
6+
ARG PT_VER=v1.1.0
77

88
RUN set -ex; apt-get update; apt-get install -y git
99

build/libtorch-x64/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
.PHONY: repack upload
3+
4+
VERSION=1.1.0
5+
6+
S3_URL=redismodules/pytorch
7+
8+
repack:
9+
@PT_VERSION=$(VERSION) ./repack.sh
10+
11+
upload:
12+
@aws s3 cp libtorch-cpu-linux-x86_64-$(VERSION).tar.gz s3://$(S3_URL)/ --acl public-read

build/libtorch-x64/repack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
OS=$(python3 $ROOT/deps/readies/bin/platform --os)
1616
ARCH=$(python3 $ROOT/deps/readies/bin/platform --arch)
1717

18-
PT_VERSION=1.0.1
18+
PT_VERSION=1.1.0
1919
#PT_VERSION="latest"
2020

2121
if [[ $OS == linux ]]; then

get_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# set -xe
3+
set -e
44

55
if [[ "$1" == "cpu" ]]; then
66
GPU=no

system-setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def common_first(self):
2121
self.pip_install("wheel")
2222
self.pip_install("setuptools --upgrade")
2323

24-
self.install("git git-lfs python3 cmake ca-certificates curl unzip wget patchelf")
24+
self.install("git git-lfs python3 cmake ca-certificates curl unzip wget patchelf awscli")
2525

2626
def debian_compat(self):
2727
self.install("build-essential")

0 commit comments

Comments
 (0)