From 33e6ef508b72f5157277162ef7192582b1200882 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Mon, 14 Jun 2021 14:30:10 +0300 Subject: [PATCH 01/13] jetson 1.8 --- opt/build/onnxruntime/Dockerfile.jetson | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 opt/build/onnxruntime/Dockerfile.jetson diff --git a/opt/build/onnxruntime/Dockerfile.jetson b/opt/build/onnxruntime/Dockerfile.jetson new file mode 100755 index 000000000..eb2df3a48 --- /dev/null +++ b/opt/build/onnxruntime/Dockerfile.jetson @@ -0,0 +1,48 @@ +# BUILD redisfab/onnxruntime-${ARCH}-${OSNICK}:$(ONNXRUNTIME_VER) + +# stretch|bionic|buster +ARG OSNICK=buster + +# arm32v7|arm64v8 +ARG ARCH=jetson + +#---------------------------------------------------------------------------------------------- +ARG OS=nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base as builder + +FROM ${OS} as builder + +ARG ONNXRUNTIME_REPO=https://github.com/microsoft/onnxruntime +ARG ONNXRUNTIME_VER=1.8.0 + +RUN apt-get -qq update +RUN apt-get -qq install -y curl wget tar git patch build-essential \ + build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \ + python3.6 python3-pip python3-dev python3-numpy +RUN pip3 install --upgrade pip setuptools wheel + +RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7-Linux-aarch64.tar.gz -O /tmp/cmake.tgz +WORKDIR /tmp +RUN tar -zxpf /tmp/cmake.tgz +RUN mv /tmp/cmake*/bin/* /usr/bin +RUN mv /tmp/cmake-*/share/cmake* /usr/share/ + +RUN rm /usr/bin/python3 +RUN ln -s /usr/bin/python3.6 /usr/bin/python3 + +ENV LANG=en_US.UTF-8 +RUN apt-get install -y locales && \ + sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=$LANG +WORKDIR /build +ARG BUILDTYPE=Release +ARG BUILDARGS="--config ${BUILDTYPE} --parallel" +RUN git clone --single-branch --branch v${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime +WORKDIR /build/onnxruntime +RUN git fetch --recurse-submodules +RUN ./build.sh ${BUILDARGS} --update --build +RUN ./build.sh ${BUILDARGS} --build_shared_lib +# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel +ADD ./pack.sh /build +WORKDIR /build +RUN ./pack.sh ${ONNXRUNTIME_VER} ${ARCH} From b101e59076e3c1b109775aeb55988b1116d4d5a1 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Tue, 15 Jun 2021 10:17:57 +0300 Subject: [PATCH 02/13] 1.8 in the Makefile --- opt/build/onnxruntime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index 1faaabae9..031d069cd 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -1,7 +1,7 @@ ROOT=. -VERSION ?= 1.7.1 +VERSION ?= 1.8 OSNICK ?= buster #---------------------------------------------------------------------------------------------- From be2a69d5580bb4bf2ca8eb3a317cdf20ee707796 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Tue, 15 Jun 2021 14:12:55 +0300 Subject: [PATCH 03/13] starting single use --- opt/build/backends.rules | 29 + opt/build/onnxruntime/.gitignore | 1 + opt/build/onnxruntime/Dockerfile.arm | 53 -- opt/build/onnxruntime/Dockerfile.arm7 | 47 -- opt/build/onnxruntime/Dockerfile.x64 | 45 -- opt/build/onnxruntime/Makefile | 270 ++++--- .../{Dockerfile.jetson => dockerfile.tmpl} | 47 +- opt/build/onnxruntime/ort-0.4.0-werror.patch | 758 ----------------- opt/build/onnxruntime/werror.patch | 759 ------------------ opt/readies | 2 +- 10 files changed, 194 insertions(+), 1817 deletions(-) create mode 100644 opt/build/backends.rules create mode 100644 opt/build/onnxruntime/.gitignore delete mode 100755 opt/build/onnxruntime/Dockerfile.arm delete mode 100755 opt/build/onnxruntime/Dockerfile.arm7 delete mode 100755 opt/build/onnxruntime/Dockerfile.x64 rename opt/build/onnxruntime/{Dockerfile.jetson => dockerfile.tmpl} (61%) delete mode 100755 opt/build/onnxruntime/ort-0.4.0-werror.patch delete mode 100755 opt/build/onnxruntime/werror.patch diff --git a/opt/build/backends.rules b/opt/build/backends.rules new file mode 100644 index 000000000..4a77683aa --- /dev/null +++ b/opt/build/backends.rules @@ -0,0 +1,29 @@ +# default is x64 +ARCH=$(shell ${READIES}/bin/platform --arch) +REDIS_CMAKE_ARCH=x86_64 + +# jetson +ifeq ($(shell test -e /usr/share/doc/nvidia-l4t-jetson-io && echo -n yes),yes) +ARCH=jetson +REDIS_CMAKE_ARCH=aarch64 +else +endif + +export REDIS_CMAKE_ARCH + +DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:buildsystem + +build: + REDIS_ARCH=${ARCH} \ + ${READIES}/bin/dockerwrapper \ + -d ${CURDIR}/Dockerfile \ + -t ${DEFAULT_DOCKER_TAG} \ + -e REDIS \ + -g \ + -D "${DOCKER_OPTS}" \ + ${DOCKER_ARGS} +# docker create --cidfile ${PRODUCT}.${ARCH}.cid ${DEFAULT_DOCKER_TAG} +# docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(1)-$(VERSION).tgz . + +publish: + @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read diff --git a/opt/build/onnxruntime/.gitignore b/opt/build/onnxruntime/.gitignore new file mode 100644 index 000000000..94143827e --- /dev/null +++ b/opt/build/onnxruntime/.gitignore @@ -0,0 +1 @@ +Dockerfile diff --git a/opt/build/onnxruntime/Dockerfile.arm b/opt/build/onnxruntime/Dockerfile.arm deleted file mode 100755 index 979b3e852..000000000 --- a/opt/build/onnxruntime/Dockerfile.arm +++ /dev/null @@ -1,53 +0,0 @@ -# BUILD redisfab/onnxruntime-${ARCH}-${OSNICK}:$(ONNXRUNTIME_VER) - -# stretch|bionic|buster -ARG OSNICK=buster - -# arm32v7|arm64v8 -ARG ARCH=arm64v8 - -#---------------------------------------------------------------------------------------------- -FROM redisfab/${ARCH}-xbuild:${OSNICK} as builder - -ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime -ARG ONNXRUNTIME_VER=1.0.0 -ARG ARCH_FLAG="--arm64" - -RUN [ "cross-build-start" ] - -RUN apt-get -qq update -RUN apt-get -qq install -y curl wget tar git patch -RUN apt-get -qq install -y build-essential cmake -RUN apt-get -qq install -y libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev - -RUN apt-get -q install -y python3 python3-pip python3-dev -RUN pip3 install --upgrade pip setuptools wheel -# RUN pip3 install numpy -RUN apt-get -q install -y python3-numpy - -WORKDIR /build - -ADD ./*.patch /build/ -ADD ./pack.sh /build/ - -ARG BUILDTYPE=MinSizeRel -ARG BUILDARGS="--config ${BUILDTYPE} ${ARCH_FLAG} --parallel" - -RUN set -e ;\ - git clone --single-branch --branch rel-${ONNXRUNTIME_BRANCH} --recursive ${ONNXRUNTIME_REPO} onnxruntime ;\ - cd onnxruntime ;\ - git checkout "rel-${ONNXRUNTIME_VER}" - -RUN set -e ;\ - cd onnxruntime ;\ - patch -p1 -i ../werror.patch - -RUN set -e ;\ - cd onnxruntime ;\ - ./build.sh ${BUILDARGS} --update --build ;\ - ./build.sh ${BUILDARGS} --build_shared_lib -# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel - -RUN ./pack.sh ${ONNXRUNTIME_VER} - -RUN [ "cross-build-end" ] diff --git a/opt/build/onnxruntime/Dockerfile.arm7 b/opt/build/onnxruntime/Dockerfile.arm7 deleted file mode 100755 index 4cfea0af0..000000000 --- a/opt/build/onnxruntime/Dockerfile.arm7 +++ /dev/null @@ -1,47 +0,0 @@ -FROM balenalib/raspberrypi3-python:latest-stretch-build - -ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime -ARG ONNXRUNTIME_BRANCH=rel-1.0.0 -ARG ONNXRUNTIME_VER=1.0.0 -ARG ARCH_FLAG="--arm" -ARG ARCH=arm64v7 - -RUN [ "cross-build-start" ] - -RUN set -e ;\ - apt-get -qq update \; - apt-get -q install -y - git tar wget curl \ - build-essential cmake \ - python3 python3-pip python3-dev \ - libcurl4-openssl-dev libssl-dev libatlas-base-dev - -RUN pip3 install --upgrade pip setuptools wheel -RUN pip3 install numpy - -WORKDIR /build - -ADD ./*.patch /build/ -ADD ./pack.sh /build/ - -ARG BUILDTYPE=MinSizeRel -ARG BUILDARGS="--config ${BUILDTYPE} ${ARM_FLAG} --parallel" - -RUN set -e ;\ - git clone --single-branch --branch ${ONNXRUNTIME_BRANCH} --recursive ${ONNXRUNTIME_REPO} onnxruntime ;\ - cd onnxruntime ;\ - git checkout "rel-${ONNXRUNTIME_VER}" - -RUN set -e ;\ - cd onnxruntime ;\ - patch -p1 -i ../werrror.patch - -RUN set -e ;\ - cd onnxruntime ;\ - ./build.sh ${BUILDARGS} --update --build ;\ - ./build.sh ${BUILDARGS} --build_shared_lib -# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel - -RUN ./pack.sh ${ONNXRUNTIME_VER} - -RUN [ "cross-build-end" ] diff --git a/opt/build/onnxruntime/Dockerfile.x64 b/opt/build/onnxruntime/Dockerfile.x64 deleted file mode 100755 index 8bbff41fb..000000000 --- a/opt/build/onnxruntime/Dockerfile.x64 +++ /dev/null @@ -1,45 +0,0 @@ -# BUILD redisfab/onnxruntime-x64-${OS}:$(ONNXRUNTIME_VER) -ARG OS=ubuntu:16.04 -#---------------------------------------------------------------------------------------------- -FROM ${OS} -ARG ONNXRUNTIME_REPO=https://github.com/RedisAI/onnxruntime -ARG ONNXRUNTIME_VER=1.7.1 -ARG ARCH=x64 - -RUN apt-get -qq update -RUN apt-get install -y software-properties-common -RUN add-apt-repository ppa:deadsnakes/ppa -RUN apt-get -qq update - -RUN apt-get -qq install -y python3.6 curl wget tar git \ - build-essential \ - libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \ - python3 python3-pip python3-dev python3-numpy -RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7-Linux-x86_64.tar.gz -O /tmp/cmake.tgz -WORKDIR /tmp -RUN tar -zxpf /tmp/cmake.tgz -RUN mv /tmp/cmake*/bin/* /usr/bin -RUN mv /tmp/cmake-*/share/cmake* /usr/share/ - -RUN rm /usr/bin/python3 -RUN ln -s /usr/bin/python3.6 /usr/bin/python3 - -RUN pip3 install --upgrade pip setuptools wheel - -ENV LANG=en_US.UTF-8 -RUN apt-get install -y locales && \ - sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales && \ - update-locale LANG=$LANG -WORKDIR /build -ARG BUILDTYPE=Release -ARG BUILDARGS="--config ${BUILDTYPE} --parallel" -RUN git clone --single-branch --branch rel-${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime -WORKDIR /build/onnxruntime -RUN git fetch --recurse-submodules -RUN ./build.sh ${BUILDARGS} --update --build -RUN ./build.sh ${BUILDARGS} --build_shared_lib -# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel -ADD ./pack.sh /build -WORKDIR /build -RUN ./pack.sh ${ONNXRUNTIME_VER} ${ARCH} diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index 031d069cd..c9a15bde4 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -1,134 +1,144 @@ +export REDIS_ONNX_VERSION = 1.8.0 +export REDIS_ONNX_REPO = https://github.com/microsoft/onnxruntime -ROOT=. - -VERSION ?= 1.8 +PRODUCT=onnxruntime +DOCKER_ORG=redislabs OSNICK ?= buster -#---------------------------------------------------------------------------------------------- - -S3_URL=redismodules/onnxruntime - -STEM=onnxruntime-linux - -KEEP ?= 1 - -DOCKER_OS.bionic=ubuntu:bionic -DOCKER_OS.stretch=debian:stretch-slim -DOCKER_OS.buster=debian:buster-slim -DOCKER_OS=$(DOCKER_OS.$(OSNICK)) - -#---------------------------------------------------------------------------------------------- - -define targets # (1=OP, 2=op) -$(1)_TARGETS := -$(1)_TARGETS += $(if $(findstring $(X64),1),$(2)_x64) -$(1)_TARGETS += $(if $(findstring $(ARM7),1),$(2)_arm32v7) -$(1)_TARGETS += $(if $(findstring $(ARM8),1),$(2)_arm64v8) - -$(1)_TARGETS += $$(if $$(strip $$($(1)_TARGETS)),,$(2)_x64 $(2)_arm32v7 $(2)_arm64v8) -endef - -$(eval $(call targets,BUILD,build)) -$(eval $(call targets,PUBLISH,publish)) - -#---------------------------------------------------------------------------------------------- -# arch=x64|arm32v7|arm64v8 -# tar_arch=x86_64|arm|arm64 - -define build_x64 # (1=arch, 2=tar-arch) -IID_$(1)=$(1)_$(VERSION).iid -CID_$(1)=$(1)_$(VERSION).cid - -build_x64: - @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-x64:$(VERSION) -f Dockerfile.x64 \ - --build-arg OS=$(DOCKER_OS) $(ROOT) - @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` - @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-x64-$(VERSION).tgz . - -.PHONY: build_x64 -endef - -define build_x64-gpu # (1=arch, 2=tar-arch) -IID_$(1)=$(1)_$(VERSION).iid -CID_$(1)=$(1)_$(VERSION).cid - -build_x64-gpu: - @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.x64-gpu \ - --build-arg OS=$(DOCKER_OS) $(ROOT) - @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` - @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(1)-$(VERSION).tgz . - -.PHONY: build_x64 -endef - -define build_arm # (1=arch, 2=tar-arch) -IID_$(1)=$(1)_$(VERSION).iid -CID_$(1)=$(1)_$(VERSION).cid - -build_$(1): - @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.arm \ - --build-arg ARCH=$(1) --build-arg ARCH_FLAG=--$(2) $(ROOT) - @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` - @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(2)-$(VERSION).tgz . -ifneq ($(KEEP),1) - # @rm $$(IID_$(1)) $$(CID_$(1)) -endif - -.PHONY: build_$(1) -endef - -#---------------------------------------------------------------------------------------------- - -define publish_x64 # (1=arch, 2=tar-arch) -publish_x64: - @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read - -.PHONY: publish_x64 -endef - -define publish_x64-gpu # (1=arch, 2=tar-arch) -publish_x64-gpu: - @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read - -.PHONY: publish_x64-gpu -endef - -define publish_arm # (1=arch, 2=tar-arch) -publish_$(1): - @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read -ifneq ($(KEEP),1) - # @rm $(STEM)-$(2)-$(VERSION).tgz -endif - -.PHONY: publish_$(1) -endef - -#---------------------------------------------------------------------------------------------- - -all: build publish - -build: $(BUILD_TARGETS) - -$(eval $(call build_x64,x64,x86_64)) -$(eval $(call build_x64-gpu,x64-gpu,x86_64-gpu)) -$(eval $(call build_arm,arm64v8,arm64)) -$(eval $(call build_arm,arm32v7,arm)) - -ifneq ($(filter publish,$(MAKECMDGOALS)),) -ifeq ($(wildcard $(HOME)/.aws/credentials),) -$(error Please run 'aws configure' and provide it with access credentials) -endif -endif - -publish: $(PUBLISH_TARGETS) - -$(eval $(call publish_x64,x64,x64)) -$(eval $(call publish_x64-gpu,x64-gpu,x64-gpu)) -$(eval $(call publish_arm,arm64v8,arm64)) -$(eval $(call publish_arm,arm32v7,arm)) - - -help: - @echo "make [build|publish] [X64=1|ARM7=1|ARM8=1]" +ROOT=. -.PHONY: all build publish help +READIES=${ROOT}/../../readies + +include ../backends.rules + +#VERSION ?= 1.8 +#OSNICK ?= buster +# +##---------------------------------------------------------------------------------------------- +# +#S3_URL=redismodules/onnxruntime +# +#STEM=onnxruntime-linux +# +#KEEP ?= 1 +# +#DOCKER_OS.bionic=ubuntu:bionic +#DOCKER_OS.stretch=debian:stretch-slim +#DOCKER_OS.buster=debian:buster-slim +#DOCKER_OS=$(DOCKER_OS.$(OSNICK)) +# +##---------------------------------------------------------------------------------------------- +# +#define targets # (1=OP, 2=op) +#$(1)_TARGETS := +#$(1)_TARGETS += $(if $(findstring $(X64),1),$(2)_x64) +#$(1)_TARGETS += $(if $(findstring $(ARM7),1),$(2)_arm32v7) +#$(1)_TARGETS += $(if $(findstring $(ARM8),1),$(2)_arm64v8) +# +#$(1)_TARGETS += $$(if $$(strip $$($(1)_TARGETS)),,$(2)_x64 $(2)_arm32v7 $(2)_arm64v8) +#endef +# +#$(eval $(call targets,BUILD,build)) +#$(eval $(call targets,PUBLISH,publish)) +# +##---------------------------------------------------------------------------------------------- +## arch=x64|arm32v7|arm64v8 +## tar_arch=x86_64|arm|arm64 +# +#define build_x64 # (1=arch, 2=tar-arch) +#IID_$(1)=$(1)_$(VERSION).iid +#CID_$(1)=$(1)_$(VERSION).cid +# +#build_x64: +# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-x64:$(VERSION) -f Dockerfile.x64 \ +# --build-arg OS=$(DOCKER_OS) $(ROOT) +# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` +# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-x64-$(VERSION).tgz . +# +#.PHONY: build_x64 +#endef +# +#define build_x64-gpu # (1=arch, 2=tar-arch) +#IID_$(1)=$(1)_$(VERSION).iid +#CID_$(1)=$(1)_$(VERSION).cid +# +#build_x64-gpu: +# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.x64-gpu \ +# --build-arg OS=$(DOCKER_OS) $(ROOT) +# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` +# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(1)-$(VERSION).tgz . +# +#.PHONY: build_x64 +#endef +# +#define build_arm # (1=arch, 2=tar-arch) +#IID_$(1)=$(1)_$(VERSION).iid +#CID_$(1)=$(1)_$(VERSION).cid +# +#build_$(1): +# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.arm \ +# --build-arg ARCH=$(1) --build-arg ARCH_FLAG=--$(2) $(ROOT) +# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` +# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(2)-$(VERSION).tgz . +#ifneq ($(KEEP),1) +# # @rm $$(IID_$(1)) $$(CID_$(1)) +#endif +# +#.PHONY: build_$(1) +#endef +# +##---------------------------------------------------------------------------------------------- +# +#define publish_x64 # (1=arch, 2=tar-arch) +#publish_x64: +# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read +# +#.PHONY: publish_x64 +#endef +# +#define publish_x64-gpu # (1=arch, 2=tar-arch) +#publish_x64-gpu: +# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read +# +#.PHONY: publish_x64-gpu +#endef +# +#define publish_arm # (1=arch, 2=tar-arch) +#publish_$(1): +# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read +#ifneq ($(KEEP),1) +# # @rm $(STEM)-$(2)-$(VERSION).tgz +#endif +# +#.PHONY: publish_$(1) +#endef +# +##---------------------------------------------------------------------------------------------- +# +#all: build publish +# +#build: $(BUILD_TARGETS) +# +#$(eval $(call build_x64,x64,x86_64)) +#$(eval $(call build_x64-gpu,x64-gpu,x86_64-gpu)) +#$(eval $(call build_arm,arm64v8,arm64)) +#$(eval $(call build_arm,arm32v7,arm)) +# +#ifneq ($(filter publish,$(MAKECMDGOALS)),) +#ifeq ($(wildcard $(HOME)/.aws/credentials),) +#$(error Please run 'aws configure' and provide it with access credentials) +#endif +#endif +# +#publish: $(PUBLISH_TARGETS) +# +#$(eval $(call publish_x64,x64,x64)) +#$(eval $(call publish_x64-gpu,x64-gpu,x64-gpu)) +#$(eval $(call publish_arm,arm64v8,arm64)) +#$(eval $(call publish_arm,arm32v7,arm)) +# +# +#help: +# @echo "make [build|publish] [X64=1|ARM7=1|ARM8=1]" +# +#.PHONY: all build publish help diff --git a/opt/build/onnxruntime/Dockerfile.jetson b/opt/build/onnxruntime/dockerfile.tmpl similarity index 61% rename from opt/build/onnxruntime/Dockerfile.jetson rename to opt/build/onnxruntime/dockerfile.tmpl index eb2df3a48..cf9eca012 100755 --- a/opt/build/onnxruntime/Dockerfile.jetson +++ b/opt/build/onnxruntime/dockerfile.tmpl @@ -1,39 +1,37 @@ -# BUILD redisfab/onnxruntime-${ARCH}-${OSNICK}:$(ONNXRUNTIME_VER) - -# stretch|bionic|buster -ARG OSNICK=buster - -# arm32v7|arm64v8 -ARG ARCH=jetson - #---------------------------------------------------------------------------------------------- -ARG OS=nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base as builder +{% if REDIS_ARCH == 'x64' %} +FROM ubuntu:bionic +{% elif REDIS_ARCH == 'jetson' %} +FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base +{% endif %} -FROM ${OS} as builder - -ARG ONNXRUNTIME_REPO=https://github.com/microsoft/onnxruntime -ARG ONNXRUNTIME_VER=1.8.0 +ARG ONNXRUNTIME_REPO={{REDIS_ONNX_REPO}} +ARG ONNXRUNTIME_VER={{REDIS_ONNX_VERSION}} RUN apt-get -qq update -RUN apt-get -qq install -y curl wget tar git patch build-essential \ +RUN DEBIAN_NONINTERACTIVE=1 apt-get install -y curl wget tar git patch \ build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \ - python3.6 python3-pip python3-dev python3-numpy -RUN pip3 install --upgrade pip setuptools wheel - -RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7-Linux-aarch64.tar.gz -O /tmp/cmake.tgz -WORKDIR /tmp -RUN tar -zxpf /tmp/cmake.tgz -RUN mv /tmp/cmake*/bin/* /usr/bin -RUN mv /tmp/cmake-*/share/cmake* /usr/share/ + python3.6 python3-pip python3-dev python3-numpy RUN rm /usr/bin/python3 RUN ln -s /usr/bin/python3.6 /usr/bin/python3 +RUN python3 -m pip install --upgrade pip setuptools wheel ENV LANG=en_US.UTF-8 RUN apt-get install -y locales && \ sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=$LANG + +{% set cmake_version = "3.19.7" %} +RUN wget -q https://github.com/Kitware/CMake/releases/download/v{{cmake_version}}/cmake-{{cmake_version}}-Linux-{{REDIS_CMAKE_ARCH}}.tar.gz -O /tmp/cmake.tgz + +WORKDIR /tmp +RUN tar -zxpf /tmp/cmake.tgz +RUN mv /tmp/cmake*/bin/* /usr/bin +RUN mv /tmp/cmake-*/share/cmake* /usr/share/ + +# build WORKDIR /build ARG BUILDTYPE=Release ARG BUILDARGS="--config ${BUILDTYPE} --parallel" @@ -42,7 +40,8 @@ WORKDIR /build/onnxruntime RUN git fetch --recurse-submodules RUN ./build.sh ${BUILDARGS} --update --build RUN ./build.sh ${BUILDARGS} --build_shared_lib -# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel + +# package ADD ./pack.sh /build WORKDIR /build -RUN ./pack.sh ${ONNXRUNTIME_VER} ${ARCH} +RUN ./pack.sh {{REDIS_ONNX_VERSION}} {{REDIS_ARCH}} diff --git a/opt/build/onnxruntime/ort-0.4.0-werror.patch b/opt/build/onnxruntime/ort-0.4.0-werror.patch deleted file mode 100755 index be5eb10b7..000000000 --- a/opt/build/onnxruntime/ort-0.4.0-werror.patch +++ /dev/null @@ -1,758 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 96c89fe..f59edea 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -411,8 +411,8 @@ else() - - if(onnxruntime_DEV_MODE) - if(NOT onnxruntime_USE_TVM) -- string(APPEND CMAKE_CXX_FLAGS " -Werror") -- string(APPEND CMAKE_C_FLAGS " -Werror") -+# string(APPEND CMAKE_CXX_FLAGS " -Werror") -+# string(APPEND CMAKE_C_FLAGS " -Werror") - endif() - endif() - check_cxx_compiler_flag(-Wunused-but-set-variable HAS_UNUSED_BUT_SET_VARIABLE) -Submodule cmake/external/eigen contains modified content -diff --git a/cmake/external/eigen/CMakeLists.txt b/cmake/external/eigen/CMakeLists.txt -index 76e083314..a515736cd 100644 ---- a/cmake/external/eigen/CMakeLists.txt -+++ b/cmake/external/eigen/CMakeLists.txt -@@ -151,10 +151,10 @@ if(NOT MSVC) - - # clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag - # adding -Werror turns such warnings into errors -- check_cxx_compiler_flag("-Werror" COMPILER_SUPPORT_WERROR) -- if(COMPILER_SUPPORT_WERROR) -- set(CMAKE_REQUIRED_FLAGS "-Werror") -- endif() -+# check_cxx_compiler_flag("-Werror" COMPILER_SUPPORT_WERROR) -+# if(COMPILER_SUPPORT_WERROR) -+# set(CMAKE_REQUIRED_FLAGS "-Werror") -+# endif() - ei_add_cxx_compiler_flag("-pedantic") - ei_add_cxx_compiler_flag("-Wall") - ei_add_cxx_compiler_flag("-Wextra") -Submodule cmake/external/googletest contains modified content -diff --git a/cmake/external/googletest/googletest/cmake/internal_utils.cmake b/cmake/external/googletest/googletest/cmake/internal_utils.cmake -index 6448918f..38e1a864 100644 ---- a/cmake/external/googletest/googletest/cmake/internal_utils.cmake -+++ b/cmake/external/googletest/googletest/cmake/internal_utils.cmake -@@ -94,7 +94,7 @@ macro(config_compiler_and_linker) - set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0") - set(cxx_no_rtti_flags "-GR-") - elseif (CMAKE_COMPILER_IS_GNUCXX) -- set(cxx_base_flags "-Wall -Wshadow -Werror") -+ set(cxx_base_flags "-Wall -Wshadow") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() -diff --git a/cmake/external/googletest/googletest/xcode/Config/General.xcconfig b/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -index f23e3222..ac07337f 100644 ---- a/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -+++ b/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -@@ -17,7 +17,7 @@ ZERO_LINK = NO - PREBINDING = NO - - // Strictest warning policy --WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow -+WARNING_CFLAGS = -Wall -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow - - // Work around Xcode bugs by using external strip. See: - // http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html -Submodule cmake/external/gsl contains modified content -diff --git a/cmake/external/gsl/tests/CMakeLists.txt b/cmake/external/gsl/tests/CMakeLists.txt -index 0e08d77..a4d103d 100644 ---- a/cmake/external/gsl/tests/CMakeLists.txt -+++ b/cmake/external/gsl/tests/CMakeLists.txt -@@ -41,7 +41,7 @@ target_compile_options(gsl_tests_config INTERFACE - -Wcast-align - -Wconversion - -Wctor-dtor-privacy -- -Werror -+# -Werror - -Wextra - -Wno-missing-braces - -Wnon-virtual-dtor -@@ -129,7 +129,7 @@ target_compile_options(gsl_tests_config_noexcept INTERFACE - -Wcast-align - -Wconversion - -Wctor-dtor-privacy -- -Werror -+# -Werror - -Wextra - -Wno-missing-braces - -Wnon-virtual-dtor -Submodule cmake/external/nsync contains modified content -diff --git a/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile b/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -index d7b138b..d76d43f 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -@@ -2,7 +2,7 @@ - # use futex directly. - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -I../../platform/c++11.futex -I../../platform/c++11 -I../../platform/gcc -I../../platform/posix -pthread --PLATFORM_CFLAGS=-std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/c++11/src/per_thread_waiter.cc ../../platform/c++11/src/yield.cc ../../platform/c++11/src/time_rep_timespec.cc ../../platform/c++11/src/nsync_panic.cc -diff --git a/cmake/external/nsync/builds/aarch64.linux.clang/Makefile b/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -index 291b3db..961aea1 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -@@ -1,6 +1,6 @@ - CC=clang - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.g++/Makefile b/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -index d4f0528..d1e2f24 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -@@ -1,6 +1,6 @@ - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/linux -I../../platform/c++11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -x c++ -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -index d5e168e..3218ce0 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -index 6251fed..238dd54 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -index 10d1104..21a2f43 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_C11 -I../../platform/c11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -index 5352904..a428b34 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -index 79a4f6d..c642bde 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_sem_t.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -index 7dbeb25..487fc55 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile b/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -index 3cd81a1..bb88607 100644 ---- a/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -+++ b/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/arm -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - PLATFORM_LIBS=-lrt - MKDEP=${CC} -M -diff --git a/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile b/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -index 009cd01..f058b7f 100644 ---- a/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -+++ b/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/arm -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - PLATFORM_LIBS=-lrt - MKDEP=${CC} -M -diff --git a/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile b/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -index d7b138b..d76d43f 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -@@ -2,7 +2,7 @@ - # use futex directly. - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -I../../platform/c++11.futex -I../../platform/c++11 -I../../platform/gcc -I../../platform/posix -pthread --PLATFORM_CFLAGS=-std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/c++11/src/per_thread_waiter.cc ../../platform/c++11/src/yield.cc ../../platform/c++11/src/time_rep_timespec.cc ../../platform/c++11/src/nsync_panic.cc -diff --git a/cmake/external/nsync/builds/x86_64.linux.clang/Makefile b/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -index dc16f1f..dfa2bfb 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -@@ -1,6 +1,6 @@ - CC=clang - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.g++/Makefile b/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -index 990e1e4..a55a5db 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/linux -I../../platform/c++11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -x c++ -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -index 870772e..26df437 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -index 6dad2b7..e98d035 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -index a7c98a1..395e8c9 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_C11 -I../../platform/c11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -index 035c19f..3ba36e3 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -index 040611c..394abf7 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_sem_t.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -index 4bfa290..0174802 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -index 347c2ce..6e70f0f 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -@@ -1,6 +1,6 @@ - # Force the use of old gcc atomics. - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc_old -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -index 732265f..f986e91 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -@@ -1,6 +1,6 @@ - CC=tcc - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/tcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -+PLATFORM_CFLAGS=-Wall - PLATFORM_LDFLAGS=-pthread - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -diff --git a/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile b/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -index 4142416..2b552ae 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -@@ -1,7 +1,7 @@ - CC=clang++ - # Some versions of MacOS (such as Sierra) require _DARWIN_C_SOURCE to include , , and (!) - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -D_DARWIN_C_SOURCE -I../../platform/c++11 -I../../platform/gcc -I../../platform/macos -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -x c++ -M -std=c++11 - # Currently, MacOS's C++11 implementation is incomplete, and does not support -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -index bf15b64..1122bb1 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/macos -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -index 653f99a..eb925bb 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -DNSYNC_ATOMIC_C11 -I../../platform/c11 -I../../platform/macos -I../../platform/clang -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -index 04943e3..cf8fc7f 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/macos -I../../platform/clang -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -Wno-deprecated-declarations -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -Wno-deprecated-declarations - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -index 2b36b8d..c02e528 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/macos -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -index adce5dc..e90f92e 100644 ---- a/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/netbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile b/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -index d8d7247..aa46d8e 100644 ---- a/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/netbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile b/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -index 8d9b035..ded5309 100644 ---- a/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc_no_tls -I../../platform/gcc -I../../platform/openbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/tools/mkmakefile.sh b/cmake/external/nsync/tools/mkmakefile.sh -index 365b34b..962962a 100644 ---- a/cmake/external/nsync/tools/mkmakefile.sh -+++ b/cmake/external/nsync/tools/mkmakefile.sh -@@ -281,11 +281,11 @@ makefile=` - esac - case "$cc_type.$cplusplus" in - gcc.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic" -+ echo "PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - case "$atomics" in -- c++11) echo "PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic" -+ c++11) echo "PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic" - echo "PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc" - echo "MKDEP_DEPEND=mkdep" - echo 'MKDEP=./mkdep ${CC} -E -c++=-std=c++11' -@@ -299,11 +299,11 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - clang.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration" -+ echo "PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - case "$atomics" in -- c++11) echo "PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic" -+ c++11) echo "PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic" - echo "PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc" - echo "MKDEP_DEPEND=mkdep" - echo 'MKDEP=./mkdep ${CC} -E -c++=-std=c++11' -@@ -317,7 +317,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - gcc.c++) echo "PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/c++11 $cppflags" -- echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic" -+ echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo 'MKDEP=${CC} -M -x c++ -std=c++11' -@@ -328,7 +328,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - clang.c++) echo "PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/c++11 $cppflags" -- echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -Wno-unneeded-internal-declaration" -+ echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic -Wno-unneeded-internal-declaration" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo 'MKDEP=${CC} -M -x c++ -std=c++11' -@@ -339,7 +339,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - tcc.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall" -+ echo "PLATFORM_CFLAGS=-Wall" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo "MKDEP_DEPEND=mkdep" -Submodule cmake/external/onnx contains modified content -diff --git a/cmake/external/onnx/CMakeLists.txt b/cmake/external/onnx/CMakeLists.txt -index 195b0486..1c903bdf 100644 ---- a/cmake/external/onnx/CMakeLists.txt -+++ b/cmake/external/onnx/CMakeLists.txt -@@ -485,7 +485,7 @@ elseif(APPLE) - else() - target_compile_options(onnx PRIVATE -Wall -Wextra) - if(${ONNX_WERROR}) -- target_compile_options(onnx PRIVATE -Werror) -+# target_compile_options(onnx PRIVATE -Werror) - endif() - endif() - -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -index 5649ddc..4ccbcde 100644 ---- a/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pedantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/onnx/third_party/benchmark/CMakeLists.txt b/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -index b1c1d3d..2d1f2b1 100644 ---- a/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -@@ -133,9 +133,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -diff --git a/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake b/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -index d0d2099..0ebedc9 100644 ---- a/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -+++ b/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -@@ -68,7 +68,7 @@ function(check_cxx_warning_flag FLAG) - set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - # Add -Werror to ensure the compiler generates an error if the warning flag - # doesn't exist. -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}") -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") - check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG}) - set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}") - endfunction() -Submodule third_party/pybind11 contains modified content -diff --git a/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt b/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -index df77d43..63cebdb 100644 ---- a/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -+++ b/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -@@ -129,7 +129,7 @@ function(pybind11_enable_warnings target_name) - if(MSVC) - target_compile_options(${target_name} PRIVATE /WX) - else() -- target_compile_options(${target_name} PRIVATE -Werror) -+# target_compile_options(${target_name} PRIVATE -Werror) - endif() - endif() - endfunction() -Submodule cmake/external/onnx-tensorrt contains modified content -Submodule third_party/onnx contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -index e64dfcec..776429d0 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -@@ -473,7 +473,7 @@ elseif(APPLE) - else() - target_compile_options(onnx PRIVATE -Wall -Wextra) - if(${ONNX_WERROR}) -- target_compile_options(onnx PRIVATE -Werror) -+# target_compile_options(onnx PRIVATE -Werror) - endif() - endif() - -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -index 5649ddc..4ccbcde 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pedantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -index b1c1d3d..2d1f2b1 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -@@ -133,9 +133,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -index d0d2099..0ebedc9 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -@@ -68,7 +68,7 @@ function(check_cxx_warning_flag FLAG) - set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - # Add -Werror to ensure the compiler generates an error if the warning flag - # doesn't exist. -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}") -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") - check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG}) - set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}") - endfunction() -Submodule third_party/pybind11 contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -index df77d43..63cebdb 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -@@ -129,7 +129,7 @@ function(pybind11_enable_warnings target_name) - if(MSVC) - target_compile_options(${target_name} PRIVATE /WX) - else() -- target_compile_options(${target_name} PRIVATE -Werror) -+# target_compile_options(${target_name} PRIVATE -Werror) - endif() - endif() - endfunction() -Submodule cmake/external/protobuf contains modified content -diff --git a/cmake/external/protobuf/m4/ax_pthread.m4 b/cmake/external/protobuf/m4/ax_pthread.m4 -index d218d1af..d479c164 100644 ---- a/cmake/external/protobuf/m4/ax_pthread.m4 -+++ b/cmake/external/protobuf/m4/ax_pthread.m4 -@@ -299,7 +299,7 @@ if test "x$ax_pthread_clang" = "xyes"; then - ax_pthread_save_CFLAGS="$CFLAGS" - for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) -- CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" -+ CFLAGS="-Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" - ac_link="$ax_pthread_save_ac_link" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], - [ac_link="$ax_pthread_2step_ac_link" -diff --git a/cmake/external/protobuf/python/setup.py b/cmake/external/protobuf/python/setup.py -index a9df075e..e8d22dd4 100755 ---- a/cmake/external/protobuf/python/setup.py -+++ b/cmake/external/protobuf/python/setup.py -@@ -208,7 +208,7 @@ if __name__ == '__main__': - extra_compile_args.append('-std=c++11') - - if warnings_as_errors in sys.argv: -- extra_compile_args.append('-Werror') -+# extra_compile_args.append('-Werror') - sys.argv.remove(warnings_as_errors) - - # C++ implementation extension -diff --git a/cmake/external/protobuf/src/Makefile.am b/cmake/external/protobuf/src/Makefile.am -index 4bb77452..c95d46b7 100644 ---- a/cmake/external/protobuf/src/Makefile.am -+++ b/cmake/external/protobuf/src/Makefile.am -@@ -876,7 +876,7 @@ no_warning_test.cc: - - no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la - no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ -- -Wall -Wextra -Werror -Wno-unused-parameter -+ -Wall -Wextra -Wno-unused-parameter - nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) - - TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -index 8619435..07141d3 100644 ---- a/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pendantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt b/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -index f7f1566..8e11602 100644 ---- a/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -@@ -84,9 +84,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -Submodule cmake/external/tvm contains modified content -diff --git a/cmake/external/tvm/Jenkinsfile b/cmake/external/tvm/Jenkinsfile -index f63e7d0f..33048562 100644 ---- a/cmake/external/tvm/Jenkinsfile -+++ b/cmake/external/tvm/Jenkinsfile -@@ -100,7 +100,6 @@ stage('Build') { - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(USE_BLAS openblas\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-gpu', 'build', '-j2') - pack_lib('gpu', tvm_multilib) -@@ -114,7 +113,6 @@ stage('Build') { - echo set\\(USE_VULKAN ON\\) >> config.cmake - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER clang-6.0\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-gpu', 'build2', '-j2') - } -@@ -132,7 +130,6 @@ stage('Build') { - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(USE_LLVM llvm-config-4.0\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-cpu', 'build', '-j2') - pack_lib('cpu', tvm_lib) -@@ -157,7 +154,6 @@ stage('Build') { - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(USE_LLVM llvm-config-5.0\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-i386', 'build', '-j2') - pack_lib('i386', tvm_multilib) -diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index 7449970d8..316668eee 100755 ---- a/tools/ci_build/build.py -+++ b/tools/ci_build/build.py -@@ -739,7 +739,7 @@ def main(): - if (args.build): - build_targets(cmake_path, build_dir, configs, args.parallel) - -- if args.test : -+ if False and args.test : - run_onnxruntime_tests(args, source_dir, ctest_path, build_dir, configs, - args.enable_pybind if not args.skip_onnx_tests else False, - args.use_tvm, args.use_tensorrt, args.use_ngraph) diff --git a/opt/build/onnxruntime/werror.patch b/opt/build/onnxruntime/werror.patch deleted file mode 100755 index ce22c419f..000000000 --- a/opt/build/onnxruntime/werror.patch +++ /dev/null @@ -1,759 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index f6252b9..613b47d 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -427,8 +427,8 @@ else() - string(APPEND CMAKE_C_FLAGS " -Wall -Wextra -ffunction-sections -fdata-sections") - - if(onnxruntime_DEV_MODE) -- string(APPEND CMAKE_CXX_FLAGS " -Werror") -- string(APPEND CMAKE_C_FLAGS " -Werror") -+# string(APPEND CMAKE_CXX_FLAGS " -Werror") -+# string(APPEND CMAKE_C_FLAGS " -Werror") - endif() - check_cxx_compiler_flag(-Wunused-but-set-variable HAS_UNUSED_BUT_SET_VARIABLE) - check_cxx_compiler_flag(-Wunused-parameter HAS_UNUSED_PARAMETER) -Submodule cmake/external/eigen contains modified content -diff --git a/cmake/external/eigen/CMakeLists.txt b/cmake/external/eigen/CMakeLists.txt -index 76e083314..a515736cd 100644 ---- a/cmake/external/eigen/CMakeLists.txt -+++ b/cmake/external/eigen/CMakeLists.txt -@@ -151,10 +151,10 @@ if(NOT MSVC) - - # clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag - # adding -Werror turns such warnings into errors -- check_cxx_compiler_flag("-Werror" COMPILER_SUPPORT_WERROR) -- if(COMPILER_SUPPORT_WERROR) -- set(CMAKE_REQUIRED_FLAGS "-Werror") -- endif() -+# check_cxx_compiler_flag("-Werror" COMPILER_SUPPORT_WERROR) -+# if(COMPILER_SUPPORT_WERROR) -+# set(CMAKE_REQUIRED_FLAGS "-Werror") -+# endif() - ei_add_cxx_compiler_flag("-pedantic") - ei_add_cxx_compiler_flag("-Wall") - ei_add_cxx_compiler_flag("-Wextra") -Submodule cmake/external/googletest contains modified content -diff --git a/cmake/external/googletest/googletest/cmake/internal_utils.cmake b/cmake/external/googletest/googletest/cmake/internal_utils.cmake -index 6448918f..38e1a864 100644 ---- a/cmake/external/googletest/googletest/cmake/internal_utils.cmake -+++ b/cmake/external/googletest/googletest/cmake/internal_utils.cmake -@@ -94,7 +94,7 @@ macro(config_compiler_and_linker) - set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0") - set(cxx_no_rtti_flags "-GR-") - elseif (CMAKE_COMPILER_IS_GNUCXX) -- set(cxx_base_flags "-Wall -Wshadow -Werror") -+ set(cxx_base_flags "-Wall -Wshadow") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() -diff --git a/cmake/external/googletest/googletest/xcode/Config/General.xcconfig b/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -index f23e3222..ac07337f 100644 ---- a/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -+++ b/cmake/external/googletest/googletest/xcode/Config/General.xcconfig -@@ -17,7 +17,7 @@ ZERO_LINK = NO - PREBINDING = NO - - // Strictest warning policy --WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow -+WARNING_CFLAGS = -Wall -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow - - // Work around Xcode bugs by using external strip. See: - // http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html -Submodule cmake/external/gsl contains modified content -diff --git a/cmake/external/gsl/tests/CMakeLists.txt b/cmake/external/gsl/tests/CMakeLists.txt -index 0e08d77..a4d103d 100644 ---- a/cmake/external/gsl/tests/CMakeLists.txt -+++ b/cmake/external/gsl/tests/CMakeLists.txt -@@ -41,7 +41,7 @@ target_compile_options(gsl_tests_config INTERFACE - -Wcast-align - -Wconversion - -Wctor-dtor-privacy -- -Werror -+# -Werror - -Wextra - -Wno-missing-braces - -Wnon-virtual-dtor -@@ -129,7 +129,7 @@ target_compile_options(gsl_tests_config_noexcept INTERFACE - -Wcast-align - -Wconversion - -Wctor-dtor-privacy -- -Werror -+# -Werror - -Wextra - -Wno-missing-braces - -Wnon-virtual-dtor -Submodule cmake/external/nsync contains modified content -diff --git a/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile b/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -index d7b138b..d76d43f 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.c++11/Makefile -@@ -2,7 +2,7 @@ - # use futex directly. - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -I../../platform/c++11.futex -I../../platform/c++11 -I../../platform/gcc -I../../platform/posix -pthread --PLATFORM_CFLAGS=-std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/c++11/src/per_thread_waiter.cc ../../platform/c++11/src/yield.cc ../../platform/c++11/src/time_rep_timespec.cc ../../platform/c++11/src/nsync_panic.cc -diff --git a/cmake/external/nsync/builds/aarch64.linux.clang/Makefile b/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -index 291b3db..961aea1 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.clang/Makefile -@@ -1,6 +1,6 @@ - CC=clang - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.g++/Makefile b/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -index d4f0528..d1e2f24 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.g++/Makefile -@@ -1,6 +1,6 @@ - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/linux -I../../platform/c++11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -x c++ -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -index d5e168e..3218ce0 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -index 6251fed..238dd54 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -index 10d1104..21a2f43 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_C11 -I../../platform/c11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -index 5352904..a428b34 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-mutex/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -index 79a4f6d..c642bde 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc.sem-sem_t/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_sem_t.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile b/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -index 7dbeb25..487fc55 100644 ---- a/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -+++ b/cmake/external/nsync/builds/aarch64.linux.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/aarch64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile b/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -index 3cd81a1..bb88607 100644 ---- a/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -+++ b/cmake/external/nsync/builds/arm.linux.gcc.atm-asm.lrt/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/arm -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - PLATFORM_LIBS=-lrt - MKDEP=${CC} -M -diff --git a/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile b/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -index 009cd01..f058b7f 100644 ---- a/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -+++ b/cmake/external/nsync/builds/arm.linux.gcc.lrt/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/arm -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - PLATFORM_LIBS=-lrt - MKDEP=${CC} -M -diff --git a/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile b/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -index d7b138b..d76d43f 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.c++11/Makefile -@@ -2,7 +2,7 @@ - # use futex directly. - CC=g++ - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -I../../platform/c++11.futex -I../../platform/c++11 -I../../platform/gcc -I../../platform/posix -pthread --PLATFORM_CFLAGS=-std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/c++11/src/per_thread_waiter.cc ../../platform/c++11/src/yield.cc ../../platform/c++11/src/time_rep_timespec.cc ../../platform/c++11/src/nsync_panic.cc -diff --git a/cmake/external/nsync/builds/x86_64.linux.clang/Makefile b/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -index dc16f1f..dfa2bfb 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.clang/Makefile -@@ -1,6 +1,6 @@ - CC=clang - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.g++/Makefile b/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -index 990e1e4..a55a5db 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.g++/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/linux -I../../platform/c++11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M -x c++ -std=c++11 - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -index 870772e..26df437 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -index 6dad2b7..e98d035 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -index a7c98a1..395e8c9 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_C11 -I../../platform/c11 -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -index 035c19f..3ba36e3 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-mutex/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -index 040611c..394abf7 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc.sem-sem_t/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_sem_t.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -index 4bfa290..0174802 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -index 347c2ce..6e70f0f 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.old_gcc/Makefile -@@ -1,6 +1,6 @@ - # Force the use of old gcc atomics. - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc_old -I../../platform/gcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/linux/src/nsync_semaphore_futex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile b/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -index 732265f..f986e91 100644 ---- a/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.linux.tcc/Makefile -@@ -1,6 +1,6 @@ - CC=tcc - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/tcc -I../../platform/linux -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -+PLATFORM_CFLAGS=-Wall - PLATFORM_LDFLAGS=-pthread - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -diff --git a/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile b/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -index 4142416..2b552ae 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.c++11/Makefile -@@ -1,7 +1,7 @@ - CC=clang++ - # Some versions of MacOS (such as Sierra) require _DARWIN_C_SOURCE to include , , and (!) - PLATFORM_CPPFLAGS=-DNSYNC_USE_CPP11_TIMEPOINT -DNSYNC_ATOMIC_CPP11 -D_DARWIN_C_SOURCE -I../../platform/c++11 -I../../platform/gcc -I../../platform/macos -I../../platform/posix -pthread --PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -+PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -x c++ -M -std=c++11 - # Currently, MacOS's C++11 implementation is incomplete, and does not support -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -index bf15b64..1122bb1 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c++11/Makefile -@@ -1,7 +1,7 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/macos -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread --PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic -+PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic - PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc - MKDEP_DEPEND=mkdep - MKDEP=./mkdep ${CC} -E -c++=-std=c++11 -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -index 653f99a..eb925bb 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-c11/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -DNSYNC_ATOMIC_C11 -I../../platform/c11 -I../../platform/macos -I../../platform/clang -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -index 04943e3..cf8fc7f 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang.atm-os/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/macos -I../../platform/clang -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -Wno-deprecated-declarations -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -Wno-deprecated-declarations - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.macos.clang/Makefile b/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -index 2b36b8d..c02e528 100644 ---- a/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -+++ b/cmake/external/nsync/builds/x86_64.macos.clang/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/clang -I../../platform/macos -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/clock_gettime.c ../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile b/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -index adce5dc..e90f92e 100644 ---- a/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -+++ b/cmake/external/nsync/builds/x86_64.netbsd.gcc.atm-asm/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-I../../platform/atomic_ind -D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/netbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile b/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -index d8d7247..aa46d8e 100644 ---- a/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.netbsd.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc -I../../platform/netbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile b/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -index 8d9b035..ded5309 100644 ---- a/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -+++ b/cmake/external/nsync/builds/x86_64.openbsd.gcc/Makefile -@@ -1,5 +1,5 @@ - PLATFORM_CPPFLAGS=-D_POSIX_C_SOURCE=200809L -I../../platform/gcc_no_tls -I../../platform/gcc -I../../platform/openbsd -I../../platform/x86_64 -I../../platform/posix -pthread --PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -+PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic - PLATFORM_LDFLAGS=-pthread - MKDEP=${CC} -M - PLATFORM_C=../../platform/posix/src/nsync_semaphore_mutex.c ../../platform/posix/src/per_thread_waiter.c ../../platform/posix/src/yield.c ../../platform/posix/src/time_rep.c ../../platform/posix/src/nsync_panic.c -diff --git a/cmake/external/nsync/tools/mkmakefile.sh b/cmake/external/nsync/tools/mkmakefile.sh -index 365b34b..962962a 100644 ---- a/cmake/external/nsync/tools/mkmakefile.sh -+++ b/cmake/external/nsync/tools/mkmakefile.sh -@@ -281,11 +281,11 @@ makefile=` - esac - case "$cc_type.$cplusplus" in - gcc.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic" -+ echo "PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - case "$atomics" in -- c++11) echo "PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic" -+ c++11) echo "PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic" - echo "PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc" - echo "MKDEP_DEPEND=mkdep" - echo 'MKDEP=./mkdep ${CC} -E -c++=-std=c++11' -@@ -299,11 +299,11 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - clang.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration" -+ echo "PLATFORM_CFLAGS=-Wall -Wextra -ansi -pedantic -Wno-unneeded-internal-declaration" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - case "$atomics" in -- c++11) echo "PLATFORM_CXXFLAGS=-Werror -Wall -Wextra -std=c++11 -pedantic" -+ c++11) echo "PLATFORM_CXXFLAGS=-Wall -Wextra -std=c++11 -pedantic" - echo "PLATFORM_CXX=../../platform/c_from_c++11/src/nsync_atm_c++.cc" - echo "MKDEP_DEPEND=mkdep" - echo 'MKDEP=./mkdep ${CC} -E -c++=-std=c++11' -@@ -317,7 +317,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - gcc.c++) echo "PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/c++11 $cppflags" -- echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic" -+ echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo 'MKDEP=${CC} -M -x c++ -std=c++11' -@@ -328,7 +328,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - clang.c++) echo "PLATFORM_CPPFLAGS=-DNSYNC_ATOMIC_CPP11 -I../../platform/c++11 $cppflags" -- echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Werror -Wall -Wextra -pedantic -Wno-unneeded-internal-declaration" -+ echo "PLATFORM_CFLAGS=-x c++ -std=c++11 -Wall -Wextra -pedantic -Wno-unneeded-internal-declaration" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo 'MKDEP=${CC} -M -x c++ -std=c++11' -@@ -339,7 +339,7 @@ makefile=` - echo "TEST_PLATFORM_OBJS=$test_platform_o" - ;; - tcc.) echo "PLATFORM_CPPFLAGS=$atomic_ind$cppflags" -- echo "PLATFORM_CFLAGS=-Werror -Wall" -+ echo "PLATFORM_CFLAGS=-Wall" - case "$ldflags" in ?*) echo "PLATFORM_LDFLAGS=$ldflags";; esac - case "$libs" in ?*) echo "PLATFORM_LIBS=$libs";; esac - echo "MKDEP_DEPEND=mkdep" -Submodule cmake/external/onnx contains modified content -diff --git a/cmake/external/onnx/CMakeLists.txt b/cmake/external/onnx/CMakeLists.txt -index 195b0486..1c903bdf 100644 ---- a/cmake/external/onnx/CMakeLists.txt -+++ b/cmake/external/onnx/CMakeLists.txt -@@ -485,7 +485,7 @@ elseif(APPLE) - else() - target_compile_options(onnx PRIVATE -Wall -Wextra) - if(${ONNX_WERROR}) -- target_compile_options(onnx PRIVATE -Werror) -+# target_compile_options(onnx PRIVATE -Werror) - endif() - endif() - -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -index 5649ddc..4ccbcde 100644 ---- a/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/onnx/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pedantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/onnx/third_party/benchmark/CMakeLists.txt b/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -index b1c1d3d..2d1f2b1 100644 ---- a/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/onnx/third_party/benchmark/CMakeLists.txt -@@ -133,9 +133,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -diff --git a/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake b/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -index d0d2099..0ebedc9 100644 ---- a/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -+++ b/cmake/external/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -@@ -68,7 +68,7 @@ function(check_cxx_warning_flag FLAG) - set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - # Add -Werror to ensure the compiler generates an error if the warning flag - # doesn't exist. -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}") -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") - check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG}) - set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}") - endfunction() -Submodule third_party/pybind11 contains modified content -diff --git a/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt b/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -index df77d43..63cebdb 100644 ---- a/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -+++ b/cmake/external/onnx/third_party/pybind11/tests/CMakeLists.txt -@@ -129,7 +129,7 @@ function(pybind11_enable_warnings target_name) - if(MSVC) - target_compile_options(${target_name} PRIVATE /WX) - else() -- target_compile_options(${target_name} PRIVATE -Werror) -+# target_compile_options(${target_name} PRIVATE -Werror) - endif() - endif() - endfunction() -Submodule cmake/external/onnx-tensorrt contains modified content -Submodule third_party/onnx contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -index e64dfcec..776429d0 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/CMakeLists.txt -@@ -473,7 +473,7 @@ elseif(APPLE) - else() - target_compile_options(onnx PRIVATE -Wall -Wextra) - if(${ONNX_WERROR}) -- target_compile_options(onnx PRIVATE -Werror) -+# target_compile_options(onnx PRIVATE -Werror) - endif() - endif() - -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -index 5649ddc..4ccbcde 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pedantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -index b1c1d3d..2d1f2b1 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/CMakeLists.txt -@@ -133,9 +133,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -index d0d2099..0ebedc9 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/benchmark/cmake/AddCXXCompilerFlag.cmake -@@ -68,7 +68,7 @@ function(check_cxx_warning_flag FLAG) - set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - # Add -Werror to ensure the compiler generates an error if the warning flag - # doesn't exist. -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}") -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") - check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG}) - set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}") - endfunction() -Submodule third_party/pybind11 contains modified content -diff --git a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -index df77d43..63cebdb 100644 ---- a/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -+++ b/cmake/external/onnx-tensorrt/third_party/onnx/third_party/pybind11/tests/CMakeLists.txt -@@ -129,7 +129,7 @@ function(pybind11_enable_warnings target_name) - if(MSVC) - target_compile_options(${target_name} PRIVATE /WX) - else() -- target_compile_options(${target_name} PRIVATE -Werror) -+# target_compile_options(${target_name} PRIVATE -Werror) - endif() - endif() - endfunction() -Submodule cmake/external/protobuf contains modified content -diff --git a/cmake/external/protobuf/m4/ax_pthread.m4 b/cmake/external/protobuf/m4/ax_pthread.m4 -index d218d1af7..d479c1648 100644 ---- a/cmake/external/protobuf/m4/ax_pthread.m4 -+++ b/cmake/external/protobuf/m4/ax_pthread.m4 -@@ -299,7 +299,7 @@ if test "x$ax_pthread_clang" = "xyes"; then - ax_pthread_save_CFLAGS="$CFLAGS" - for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) -- CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" -+ CFLAGS="-Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" - ac_link="$ax_pthread_save_ac_link" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], - [ac_link="$ax_pthread_2step_ac_link" -diff --git a/cmake/external/protobuf/python/setup.py b/cmake/external/protobuf/python/setup.py -index a9df075e7..e8d22dd4e 100755 ---- a/cmake/external/protobuf/python/setup.py -+++ b/cmake/external/protobuf/python/setup.py -@@ -208,7 +208,7 @@ if __name__ == '__main__': - extra_compile_args.append('-std=c++11') - - if warnings_as_errors in sys.argv: -- extra_compile_args.append('-Werror') -+# extra_compile_args.append('-Werror') - sys.argv.remove(warnings_as_errors) - - # C++ implementation extension -diff --git a/cmake/external/protobuf/src/Makefile.am b/cmake/external/protobuf/src/Makefile.am -index 4bb77452f..c95d46b71 100644 ---- a/cmake/external/protobuf/src/Makefile.am -+++ b/cmake/external/protobuf/src/Makefile.am -@@ -876,7 +876,7 @@ no_warning_test.cc: - - no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la - no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ -- -Wall -Wextra -Werror -Wno-unused-parameter -+ -Wall -Wextra -Wno-unused-parameter - nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) - - TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ -Submodule third_party/benchmark contains modified content -diff --git a/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py b/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -index 8619435..07141d3 100644 ---- a/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -+++ b/cmake/external/protobuf/third_party/benchmark/.ycm_extra_conf.py -@@ -6,7 +6,6 @@ import ycm_core - # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. - flags = [ - '-Wall', --'-Werror', - '-pendantic-errors', - '-std=c++0x', - '-fno-strict-aliasing', -diff --git a/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt b/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -index f7f1566..8e11602 100644 ---- a/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -+++ b/cmake/external/protobuf/third_party/benchmark/CMakeLists.txt -@@ -84,9 +84,9 @@ else() - - add_cxx_compiler_flag(-Wextra) - add_cxx_compiler_flag(-Wshadow) -- add_cxx_compiler_flag(-Werror RELEASE) -- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -- add_cxx_compiler_flag(-Werror MINSIZEREL) -+# add_cxx_compiler_flag(-Werror RELEASE) -+# add_cxx_compiler_flag(-Werror RELWITHDEBINFO) -+# add_cxx_compiler_flag(-Werror MINSIZEREL) - add_cxx_compiler_flag(-pedantic) - add_cxx_compiler_flag(-pedantic-errors) - add_cxx_compiler_flag(-Wshorten-64-to-32) -Submodule cmake/external/tvm contains untracked content -Submodule cmake/external/tvm contains modified content -diff --git a/cmake/external/tvm/Jenkinsfile b/cmake/external/tvm/Jenkinsfile -index 608f9ca8..b6e38952 100644 ---- a/cmake/external/tvm/Jenkinsfile -+++ b/cmake/external/tvm/Jenkinsfile -@@ -101,7 +101,6 @@ stage('Build') { - echo set\\(USE_ANTLR ON\\) >> config.cmake - echo set\\(USE_BLAS openblas\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-gpu', 'build', '-j2') - pack_lib('gpu', tvm_multilib) -@@ -115,7 +114,6 @@ stage('Build') { - echo set\\(USE_VULKAN ON\\) >> config.cmake - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER clang-6.0\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-gpu', 'build2', '-j2') - } -@@ -136,7 +134,6 @@ stage('Build') { - echo set\\(NNPACK_PATH /NNPACK/build/\\) >> config.cmake - echo set\\(USE_ANTLR ON\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-cpu', 'build', '-j2') - pack_lib('cpu', tvm_lib) -@@ -164,7 +161,6 @@ stage('Build') { - echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake - echo set\\(USE_LLVM llvm-config-5.0\\) >> config.cmake - echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake -- echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake - """ - make('tvmai/ci-i386', 'build', '-j2') - pack_lib('i386', tvm_multilib) -diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index 9da8b5d002..0a365d03c9 100755 ---- a/tools/ci_build/build.py -+++ b/tools/ci_build/build.py -@@ -902,7 +902,7 @@ def main(): - if (args.build): - build_targets(cmake_path, build_dir, configs, args.parallel) - -- if args.test : -+ if False and args.test : - run_onnxruntime_tests(args, source_dir, ctest_path, build_dir, configs, - args.enable_pybind and not args.skip_onnx_tests, - args.use_tvm, args.use_tensorrt, args.use_ngraph) diff --git a/opt/readies b/opt/readies index 75459c614..8759303e5 160000 --- a/opt/readies +++ b/opt/readies @@ -1 +1 @@ -Subproject commit 75459c6142ac01ff82fa7b4646d9d574d177fa3d +Subproject commit 8759303e553884f98251758f5929d928e7d487cd From ddb21118c50d35bf6199326e63c021ae0641bf58 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Tue, 15 Jun 2021 15:46:13 +0300 Subject: [PATCH 04/13] splitting a backend --- opt/build/backends.rules | 23 +++++++++++++++++------ opt/build/onnxruntime/.gitignore | 1 + opt/build/onnxruntime/Makefile | 2 +- opt/build/onnxruntime/dockerfile.tmpl | 17 ++++++++++++++--- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/opt/build/backends.rules b/opt/build/backends.rules index 4a77683aa..8dc3eaa8e 100644 --- a/opt/build/backends.rules +++ b/opt/build/backends.rules @@ -1,5 +1,6 @@ # default is x64 ARCH=$(shell ${READIES}/bin/platform --arch) +OS=$(shell ${READIES}/bin/platform --os) REDIS_CMAKE_ARCH=x86_64 # jetson @@ -8,22 +9,32 @@ ARCH=jetson REDIS_CMAKE_ARCH=aarch64 else endif - export REDIS_CMAKE_ARCH -DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:buildsystem + +# override if necessary in top-level make files +DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:build +BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VERSION}.tgz +CIDFILE=${PRODUCT}.${ARCH}.cid + +ifeq ($(GPU),1) +REDIS_GPU=1 +export REDIS_GPU +endif + +S3_URL=redismodules/${PRODUCT} build: + @rm -f ${BACKEND_NAME} *.cid REDIS_ARCH=${ARCH} \ ${READIES}/bin/dockerwrapper \ -d ${CURDIR}/Dockerfile \ -t ${DEFAULT_DOCKER_TAG} \ -e REDIS \ - -g \ -D "${DOCKER_OPTS}" \ ${DOCKER_ARGS} -# docker create --cidfile ${PRODUCT}.${ARCH}.cid ${DEFAULT_DOCKER_TAG} -# docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(1)-$(VERSION).tgz . + docker create --cidfile ${CIDFILE} ${DEFAULT_DOCKER_TAG} + docker cp `cat ${CIDFILE}`:/build/${BACKEND_NAME} . publish: - @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read + @aws s3 cp ${BACKEND_NAME} s3://$(S3_URL)/ --acl public-read diff --git a/opt/build/onnxruntime/.gitignore b/opt/build/onnxruntime/.gitignore index 94143827e..ce84fec50 100644 --- a/opt/build/onnxruntime/.gitignore +++ b/opt/build/onnxruntime/.gitignore @@ -1 +1,2 @@ Dockerfile +onnxruntime.x64.cid diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index c9a15bde4..ab8a7d4af 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -3,7 +3,7 @@ export REDIS_ONNX_REPO = https://github.com/microsoft/onnxruntime PRODUCT=onnxruntime DOCKER_ORG=redislabs -OSNICK ?= buster +VERSION=${REDIS_ONNX_VERSION} ROOT=. diff --git a/opt/build/onnxruntime/dockerfile.tmpl b/opt/build/onnxruntime/dockerfile.tmpl index cf9eca012..c22768746 100755 --- a/opt/build/onnxruntime/dockerfile.tmpl +++ b/opt/build/onnxruntime/dockerfile.tmpl @@ -1,6 +1,11 @@ #---------------------------------------------------------------------------------------------- {% if REDIS_ARCH == 'x64' %} +FROM nvidia/cuda:11.0-cudnn8-devel-ubuntu18.04 +{% if REDIS_GPU is defined %} +{% else %} FROM ubuntu:bionic +{% endif %} + {% elif REDIS_ARCH == 'jetson' %} FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base {% endif %} @@ -33,13 +38,19 @@ RUN mv /tmp/cmake-*/share/cmake* /usr/share/ # build WORKDIR /build +{% if REDIS_GPU is defined %} +ARG BUILDTYPE=MinSizeRel +ARG BUILDARGS="--use_cuda --cudnn_home /usr/local/cuda --cuda_home /usr/local/cuda" +{% else %} ARG BUILDTYPE=Release +ARG BUILDARGS +{% endif %} + ARG BUILDARGS="--config ${BUILDTYPE} --parallel" RUN git clone --single-branch --branch v${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime WORKDIR /build/onnxruntime -RUN git fetch --recurse-submodules -RUN ./build.sh ${BUILDARGS} --update --build -RUN ./build.sh ${BUILDARGS} --build_shared_lib +RUN git fetch --recurse-submodules -j4 +RUN ./build.sh --config ${BUILDTYPE} ${BUILDARGS} --update --build --build_shared_lib --parallel # package ADD ./pack.sh /build From 68fdfc7f076478040ab3f95f368f466fb942b1fb Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Tue, 15 Jun 2021 17:08:19 +0300 Subject: [PATCH 05/13] onnx 1.8 64-bit linux, 64-bit linux with gpu, and jetson --- docs/developer-backends.md | 48 ++++++++++ docs/developer.md | 2 + opt/build/backends.rules | 11 ++- opt/build/onnxruntime/Makefile | 132 -------------------------- opt/build/onnxruntime/dockerfile.tmpl | 2 +- opt/build/onnxruntime/pack.sh | 18 +++- 6 files changed, 73 insertions(+), 140 deletions(-) create mode 100644 docs/developer-backends.md diff --git a/docs/developer-backends.md b/docs/developer-backends.md new file mode 100644 index 000000000..26fcff676 --- /dev/null +++ b/docs/developer-backends.md @@ -0,0 +1,48 @@ +# RedisAI Development Backends + +This document describes how a backend for RedisAI can be built, from this repository. It highlights the supported compilation devices on a per-backend basis, and highlights the tools and commands required. Unless indicated otherwise, a backend is compiled in a docker, which is responsible for the configuration and installation of all tools required for a given backend on a per-platform basis. + +To follow these instructions, this repository must be cloned with all of its submodules (i.e *git clone --recursive https://github.com/RedisLabsModules/redisai*) + +GNU Make is used as a runner for the dockerfile generator. Python is the language used for the generator script, and jinja is the templating library used to create the docker file from the template. + +## Tools + +Buiding the backends requires installation of the following tools: + +1. gnu make +1. python (3.0 or higher) +1. docker +1. jinja2 jinja is used to generate the platform dockerfile from a *dockerfile.tmpl* that can be found in the directory of a given backend listed below. + +On ubuntu bionic these can be installed by running: + +* sudo apt install python3 python3-dev make docker +* pip install --user jinja + +------- + +## Backends + +### onnxruntime + +**Compilation target devices:** + +1. x86\_64 bit linux systems + +1. x86\_64 bit linux systems with a GPU + +1. jetson devices + +**Directory:** opt/build/onnxruntime + +**Build options:** + +1. To build run *make* + +1. To build with GPU support on x86\_64 run *make GPU=1* + +1. Should you want to build multiple targets from a shared directory, run *make DOCKER_SUFFIX=* on your target system. For example, if building on an arm and x64 workload, from a shared directory run: + * On x86: make DOCKER\_SUFFIX=x86\_64 + + * On arm: make DOCKER\_SUFFIX=arm diff --git a/docs/developer.md b/docs/developer.md index 31455b335..989b74785 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -169,6 +169,8 @@ sudo ./opt/system-setup.py To compile RedisAI, run *make -C opt*, from the root of the repository. +Build the backends is described in [this document](developer-backends.md). + ### Testing **Running Tests** diff --git a/opt/build/backends.rules b/opt/build/backends.rules index 8dc3eaa8e..32def3ced 100644 --- a/opt/build/backends.rules +++ b/opt/build/backends.rules @@ -14,21 +14,28 @@ export REDIS_CMAKE_ARCH # override if necessary in top-level make files DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:build -BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VERSION}.tgz CIDFILE=${PRODUCT}.${ARCH}.cid ifeq ($(GPU),1) REDIS_GPU=1 +VARIANT=gpu +CIDFILE=${PRODUCT}.${ARCH}.cid export REDIS_GPU endif +ifeq ($(VARIANT),) +BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VERSION}.tgz +else +BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VARIANT}-${VERSION}.tgz +endif + S3_URL=redismodules/${PRODUCT} build: @rm -f ${BACKEND_NAME} *.cid REDIS_ARCH=${ARCH} \ ${READIES}/bin/dockerwrapper \ - -d ${CURDIR}/Dockerfile \ + -d ${CURDIR}/Dockerfile${DOCKER_SUFFIX} \ -t ${DEFAULT_DOCKER_TAG} \ -e REDIS \ -D "${DOCKER_OPTS}" \ diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index ab8a7d4af..de5134006 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -10,135 +10,3 @@ ROOT=. READIES=${ROOT}/../../readies include ../backends.rules - -#VERSION ?= 1.8 -#OSNICK ?= buster -# -##---------------------------------------------------------------------------------------------- -# -#S3_URL=redismodules/onnxruntime -# -#STEM=onnxruntime-linux -# -#KEEP ?= 1 -# -#DOCKER_OS.bionic=ubuntu:bionic -#DOCKER_OS.stretch=debian:stretch-slim -#DOCKER_OS.buster=debian:buster-slim -#DOCKER_OS=$(DOCKER_OS.$(OSNICK)) -# -##---------------------------------------------------------------------------------------------- -# -#define targets # (1=OP, 2=op) -#$(1)_TARGETS := -#$(1)_TARGETS += $(if $(findstring $(X64),1),$(2)_x64) -#$(1)_TARGETS += $(if $(findstring $(ARM7),1),$(2)_arm32v7) -#$(1)_TARGETS += $(if $(findstring $(ARM8),1),$(2)_arm64v8) -# -#$(1)_TARGETS += $$(if $$(strip $$($(1)_TARGETS)),,$(2)_x64 $(2)_arm32v7 $(2)_arm64v8) -#endef -# -#$(eval $(call targets,BUILD,build)) -#$(eval $(call targets,PUBLISH,publish)) -# -##---------------------------------------------------------------------------------------------- -## arch=x64|arm32v7|arm64v8 -## tar_arch=x86_64|arm|arm64 -# -#define build_x64 # (1=arch, 2=tar-arch) -#IID_$(1)=$(1)_$(VERSION).iid -#CID_$(1)=$(1)_$(VERSION).cid -# -#build_x64: -# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-x64:$(VERSION) -f Dockerfile.x64 \ -# --build-arg OS=$(DOCKER_OS) $(ROOT) -# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` -# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-x64-$(VERSION).tgz . -# -#.PHONY: build_x64 -#endef -# -#define build_x64-gpu # (1=arch, 2=tar-arch) -#IID_$(1)=$(1)_$(VERSION).iid -#CID_$(1)=$(1)_$(VERSION).cid -# -#build_x64-gpu: -# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.x64-gpu \ -# --build-arg OS=$(DOCKER_OS) $(ROOT) -# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` -# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(1)-$(VERSION).tgz . -# -#.PHONY: build_x64 -#endef -# -#define build_arm # (1=arch, 2=tar-arch) -#IID_$(1)=$(1)_$(VERSION).iid -#CID_$(1)=$(1)_$(VERSION).cid -# -#build_$(1): -# @docker build --iidfile $$(IID_$(1)) -t redisfab/$(STEM)-$(1):$(VERSION) -f Dockerfile.arm \ -# --build-arg ARCH=$(1) --build-arg ARCH_FLAG=--$(2) $(ROOT) -# @docker create --cidfile $$(CID_$(1)) `cat $$(IID_$(1))` -# @docker cp `cat $$(CID_$(1))`:/build/$(STEM)-$(2)-$(VERSION).tgz . -#ifneq ($(KEEP),1) -# # @rm $$(IID_$(1)) $$(CID_$(1)) -#endif -# -#.PHONY: build_$(1) -#endef -# -##---------------------------------------------------------------------------------------------- -# -#define publish_x64 # (1=arch, 2=tar-arch) -#publish_x64: -# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read -# -#.PHONY: publish_x64 -#endef -# -#define publish_x64-gpu # (1=arch, 2=tar-arch) -#publish_x64-gpu: -# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read -# -#.PHONY: publish_x64-gpu -#endef -# -#define publish_arm # (1=arch, 2=tar-arch) -#publish_$(1): -# @aws s3 cp $(STEM)-$(2)-$(VERSION).tgz s3://$(S3_URL)/ --acl public-read -#ifneq ($(KEEP),1) -# # @rm $(STEM)-$(2)-$(VERSION).tgz -#endif -# -#.PHONY: publish_$(1) -#endef -# -##---------------------------------------------------------------------------------------------- -# -#all: build publish -# -#build: $(BUILD_TARGETS) -# -#$(eval $(call build_x64,x64,x86_64)) -#$(eval $(call build_x64-gpu,x64-gpu,x86_64-gpu)) -#$(eval $(call build_arm,arm64v8,arm64)) -#$(eval $(call build_arm,arm32v7,arm)) -# -#ifneq ($(filter publish,$(MAKECMDGOALS)),) -#ifeq ($(wildcard $(HOME)/.aws/credentials),) -#$(error Please run 'aws configure' and provide it with access credentials) -#endif -#endif -# -#publish: $(PUBLISH_TARGETS) -# -#$(eval $(call publish_x64,x64,x64)) -#$(eval $(call publish_x64-gpu,x64-gpu,x64-gpu)) -#$(eval $(call publish_arm,arm64v8,arm64)) -#$(eval $(call publish_arm,arm32v7,arm)) -# -# -#help: -# @echo "make [build|publish] [X64=1|ARM7=1|ARM8=1]" -# -#.PHONY: all build publish help diff --git a/opt/build/onnxruntime/dockerfile.tmpl b/opt/build/onnxruntime/dockerfile.tmpl index c22768746..07a0cd94c 100755 --- a/opt/build/onnxruntime/dockerfile.tmpl +++ b/opt/build/onnxruntime/dockerfile.tmpl @@ -55,4 +55,4 @@ RUN ./build.sh --config ${BUILDTYPE} ${BUILDARGS} --update --build --build_share # package ADD ./pack.sh /build WORKDIR /build -RUN ./pack.sh {{REDIS_ONNX_VERSION}} {{REDIS_ARCH}} +RUN ./pack.sh {{REDIS_ONNX_VERSION}} {{REDIS_ARCH}} ${BUILDTYPE} linux {% if REDIS_GPU is defined %} gpu {% endif %} diff --git a/opt/build/onnxruntime/pack.sh b/opt/build/onnxruntime/pack.sh index ba3705a2c..93f82d1fc 100755 --- a/opt/build/onnxruntime/pack.sh +++ b/opt/build/onnxruntime/pack.sh @@ -1,11 +1,19 @@ #!/bin/bash set -e -VER="$1" -PLATFORM="$2" +VER="$1" # 1.8.0 +PLATFORM="$2" # x64|jetson +BUILDTYPE="$3" # Release +BASEOS="$4" # linux (mac future?) +VARIANT="$5" # if set (gpu) + +target=onnxruntime-${BASEOS}-${PLATFORM}-${VER} +if [ ! -z "${VARIANT}" ]; then + target=onnxruntime-${BASEOS}-${PLATFORM}-${VARIANT}-${VER} +fi mkdir -p pack/include pack/lib -cp onnxruntime/build/Linux/Release/libonnxruntime.so.${VER} pack/lib/ +cp onnxruntime/build/Linux/$BUILDTYPE/libonnxruntime.so.${VER} pack/lib/ cp onnxruntime/docs/C_API_Guidelines.md pack/ cp onnxruntime/LICENSE pack/ cp onnxruntime/README.md pack/ @@ -19,5 +27,5 @@ cp onnxruntime/include/onnxruntime/core/providers/cuda/cuda_provider_factory.h p cd pack/lib/ ln -s libonnxruntime.so.${VER} libonnxruntime.so cd ../.. -mv pack onnxruntime-linux-${PLATFORM}-${VER} -tar czf onnxruntime-linux-${PLATFORM}-${VER}.tgz onnxruntime-linux-${PLATFORM}-${VER}/ +mv pack ${target} +tar czf ${target}.tgz ${target}/ From 1136450b006ef545603eea34520405848f9885d6 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Wed, 16 Jun 2021 14:04:19 +0300 Subject: [PATCH 06/13] split up onnx to use docker library parts --- opt/build/backends.rules | 1 + opt/build/dockerparts/apt.yml | 16 ++++++++++++++++ opt/build/dockerparts/cmake.yml | 9 +++++++++ opt/build/onnxruntime/dockerfile.tmpl | 25 +++---------------------- 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 opt/build/dockerparts/apt.yml create mode 100644 opt/build/dockerparts/cmake.yml diff --git a/opt/build/backends.rules b/opt/build/backends.rules index 32def3ced..f9ac74bb7 100644 --- a/opt/build/backends.rules +++ b/opt/build/backends.rules @@ -37,6 +37,7 @@ build: ${READIES}/bin/dockerwrapper \ -d ${CURDIR}/Dockerfile${DOCKER_SUFFIX} \ -t ${DEFAULT_DOCKER_TAG} \ + -S ../dockerparts \ -e REDIS \ -D "${DOCKER_OPTS}" \ ${DOCKER_ARGS} diff --git a/opt/build/dockerparts/apt.yml b/opt/build/dockerparts/apt.yml new file mode 100644 index 000000000..3a363e7fb --- /dev/null +++ b/opt/build/dockerparts/apt.yml @@ -0,0 +1,16 @@ +RUN apt-get -qq update +RUN DEBIAN_NONINTERACTIVE=1 apt-get install -y curl wget tar git patch \ + build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \ + python3.6 python3-pip python3-dev python3-numpy + +RUN rm /usr/bin/python3 +RUN ln -s /usr/bin/python3.6 /usr/bin/python3 +RUN python3 -m pip install --upgrade pip setuptools wheel + +ENV LANG=en_US.UTF-8 +RUN apt-get install -y locales && \ + sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=$LANG + + diff --git a/opt/build/dockerparts/cmake.yml b/opt/build/dockerparts/cmake.yml new file mode 100644 index 000000000..91f9a807f --- /dev/null +++ b/opt/build/dockerparts/cmake.yml @@ -0,0 +1,9 @@ +{% set cmake_version = "3.19.7" %} +RUN wget -q https://github.com/Kitware/CMake/releases/download/v{{cmake_version}}/cmake-{{cmake_version}}-Linux-{{REDIS_CMAKE_ARCH}}.tar.gz -O /tmp/cmake.tgz + +WORKDIR /tmp +RUN tar -zxpf /tmp/cmake.tgz +RUN mv /tmp/cmake*/bin/* /usr/bin +RUN mv /tmp/cmake-*/share/cmake* /usr/share/ + + diff --git a/opt/build/onnxruntime/dockerfile.tmpl b/opt/build/onnxruntime/dockerfile.tmpl index 07a0cd94c..2c19bb2f4 100755 --- a/opt/build/onnxruntime/dockerfile.tmpl +++ b/opt/build/onnxruntime/dockerfile.tmpl @@ -1,7 +1,7 @@ #---------------------------------------------------------------------------------------------- {% if REDIS_ARCH == 'x64' %} -FROM nvidia/cuda:11.0-cudnn8-devel-ubuntu18.04 {% if REDIS_GPU is defined %} +FROM nvidia/cuda:11.0-cudnn8-devel-ubuntu18.04 {% else %} FROM ubuntu:bionic {% endif %} @@ -13,28 +13,9 @@ FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base ARG ONNXRUNTIME_REPO={{REDIS_ONNX_REPO}} ARG ONNXRUNTIME_VER={{REDIS_ONNX_VERSION}} -RUN apt-get -qq update -RUN DEBIAN_NONINTERACTIVE=1 apt-get install -y curl wget tar git patch \ - build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \ - python3.6 python3-pip python3-dev python3-numpy - -RUN rm /usr/bin/python3 -RUN ln -s /usr/bin/python3.6 /usr/bin/python3 -RUN python3 -m pip install --upgrade pip setuptools wheel - -ENV LANG=en_US.UTF-8 -RUN apt-get install -y locales && \ - sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales && \ - update-locale LANG=$LANG - -{% set cmake_version = "3.19.7" %} -RUN wget -q https://github.com/Kitware/CMake/releases/download/v{{cmake_version}}/cmake-{{cmake_version}}-Linux-{{REDIS_CMAKE_ARCH}}.tar.gz -O /tmp/cmake.tgz +{% include 'apt.yml' %} -WORKDIR /tmp -RUN tar -zxpf /tmp/cmake.tgz -RUN mv /tmp/cmake*/bin/* /usr/bin -RUN mv /tmp/cmake-*/share/cmake* /usr/share/ +{% include 'cmake.yml' %} # build WORKDIR /build From fffa1ea7f485a47fa1ec8f62e14898326e40ad53 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Thu, 17 Jun 2021 12:55:57 +0300 Subject: [PATCH 07/13] pr comments --- opt/build/backends.rules | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opt/build/backends.rules b/opt/build/backends.rules index f9ac74bb7..8881c8439 100644 --- a/opt/build/backends.rules +++ b/opt/build/backends.rules @@ -7,11 +7,10 @@ REDIS_CMAKE_ARCH=x86_64 ifeq ($(shell test -e /usr/share/doc/nvidia-l4t-jetson-io && echo -n yes),yes) ARCH=jetson REDIS_CMAKE_ARCH=aarch64 -else +GPU=1 endif export REDIS_CMAKE_ARCH - # override if necessary in top-level make files DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:build CIDFILE=${PRODUCT}.${ARCH}.cid @@ -19,7 +18,7 @@ CIDFILE=${PRODUCT}.${ARCH}.cid ifeq ($(GPU),1) REDIS_GPU=1 VARIANT=gpu -CIDFILE=${PRODUCT}.${ARCH}.cid +CIDFILE=${PRODUCT}.${ARCH}.gpu.cid # this way we can build from the same tree across platforms export REDIS_GPU endif From bbfde5b406efefc7c68e8859baba03a00756f661 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Thu, 17 Jun 2021 12:59:23 +0300 Subject: [PATCH 08/13] pr comments --- opt/build/onnxruntime/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index de5134006..aa8de57e0 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -1,5 +1,8 @@ -export REDIS_ONNX_VERSION = 1.8.0 -export REDIS_ONNX_REPO = https://github.com/microsoft/onnxruntime +REDIS_ONNX_VERSION?=1.8.0 +REDIS_ONNX_REPO?=https://github.com/microsoft/onnxruntime + +export REDIS_ONNX_VERSION +export REDIS_ONNX_REPO PRODUCT=onnxruntime DOCKER_ORG=redislabs From b597ae6346a5518339c75c1f0d261920e8926182 Mon Sep 17 00:00:00 2001 From: Chayim Kirshen Date: Sun, 25 Jul 2021 09:33:26 +0000 Subject: [PATCH 09/13] osx pack --- opt/build/onnxruntime/pack.sh | 44 +++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/opt/build/onnxruntime/pack.sh b/opt/build/onnxruntime/pack.sh index 93f82d1fc..b82151c28 100755 --- a/opt/build/onnxruntime/pack.sh +++ b/opt/build/onnxruntime/pack.sh @@ -7,25 +7,45 @@ BUILDTYPE="$3" # Release BASEOS="$4" # linux (mac future?) VARIANT="$5" # if set (gpu) +if [ ${BASEOS} == "MacOS" ]; then +BASEDIR=`pwd` # already in the directory on a mac +PACKDIR=${BASEDIR}/pack/ +else +BASEDIR=onnxrumtime +PACKDIR=${BASEDIR}/../pack/ +fi + target=onnxruntime-${BASEOS}-${PLATFORM}-${VER} if [ ! -z "${VARIANT}" ]; then target=onnxruntime-${BASEOS}-${PLATFORM}-${VARIANT}-${VER} fi mkdir -p pack/include pack/lib -cp onnxruntime/build/Linux/$BUILDTYPE/libonnxruntime.so.${VER} pack/lib/ -cp onnxruntime/docs/C_API_Guidelines.md pack/ -cp onnxruntime/LICENSE pack/ -cp onnxruntime/README.md pack/ -cp onnxruntime/ThirdPartyNotices.txt pack/ -cp onnxruntime/VERSION_NUMBER pack/ -cd onnxruntime/ -git rev-parse HEAD > ../pack/GIT_COMMIT_ID -cd .. -cp onnxruntime/include/onnxruntime/core/session/onnxruntime_c_api.h pack/include/ -cp onnxruntime/include/onnxruntime/core/providers/cuda/cuda_provider_factory.h pack/include/ +cp ${BASEDIR}/docs/C_API_Guidelines.md ${PACKDIR} +cp ${BASEDIR}/LICENSE ${PACKDIR} +cp ${BASEDIR}/README.md ${PACKDIR} +cp ${BASEDIR}/ThirdPartyNotices.txt ${PACKDIR} +cp ${BASEDIR}/VERSION_NUMBER ${PACKDIR} +cp ${BASEDIR}/include/onnxruntime/core/session/onnxruntime_c_api.h ${PACKDIR}/include/ +cp ${BASEDIR}/include/onnxruntime/core/providers/cuda/cuda_provider_factory.h ${PACKDIR}/include/ + +if [ ${BASEOS} == "MacOS" ]; then +cp ${BASEDIR}/build/${BASEOS}/$BUILDTYPE/libonnxruntime.${VER}.dylib ${PACKDIR}/lib/ +else +cp ${BASEDIR}/build/${BASEOS}/$BUILDTYPE/libonnxruntime.so.${VER} ${PACKDIR}/lib/ +fi + +# hash +cd ${BASEDIR}/ +git rev-parse HEAD > ${PACKDIR}/GIT_COMMIT_ID + cd pack/lib/ +if [ ${BASEOS} != "MacOS" ]; then ln -s libonnxruntime.so.${VER} libonnxruntime.so -cd ../.. +else +ln -s libonnxruntime.${VER}.dylib libonnxruntime.dylib +fi + +cd ${PACKDIR}/.. mv pack ${target} tar czf ${target}.tgz ${target}/ From d013cf60776285c1e2058a2fd37e77b29624c331 Mon Sep 17 00:00:00 2001 From: Chayim Kirshen Date: Sun, 25 Jul 2021 11:14:13 +0000 Subject: [PATCH 10/13] mac, x64 new 1.7.2 --- opt/build/backends.rules | 7 ++++--- opt/build/onnxruntime/Makefile | 7 ++++--- opt/build/onnxruntime/dockerfile.tmpl | 19 ++++++++----------- opt/build/onnxruntime/pack.sh | 13 +++++++++---- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/opt/build/backends.rules b/opt/build/backends.rules index 8881c8439..51bdd6709 100644 --- a/opt/build/backends.rules +++ b/opt/build/backends.rules @@ -23,9 +23,9 @@ export REDIS_GPU endif ifeq ($(VARIANT),) -BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VERSION}.tgz +BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${REDIS_BACKEND_VERSION}.tgz else -BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VARIANT}-${VERSION}.tgz +BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VARIANT}-${REDIS_BACKEND_VERSION}.tgz endif S3_URL=redismodules/${PRODUCT} @@ -33,6 +33,7 @@ S3_URL=redismodules/${PRODUCT} build: @rm -f ${BACKEND_NAME} *.cid REDIS_ARCH=${ARCH} \ + VERSION=${VERSION} \ ${READIES}/bin/dockerwrapper \ -d ${CURDIR}/Dockerfile${DOCKER_SUFFIX} \ -t ${DEFAULT_DOCKER_TAG} \ @@ -41,7 +42,7 @@ build: -D "${DOCKER_OPTS}" \ ${DOCKER_ARGS} docker create --cidfile ${CIDFILE} ${DEFAULT_DOCKER_TAG} - docker cp `cat ${CIDFILE}`:/build/${BACKEND_NAME} . + docker cp `cat ${CIDFILE}`:/build/${PRODUCT}/${BACKEND_NAME} . publish: @aws s3 cp ${BACKEND_NAME} s3://$(S3_URL)/ --acl public-read diff --git a/opt/build/onnxruntime/Makefile b/opt/build/onnxruntime/Makefile index aa8de57e0..a88a511bc 100755 --- a/opt/build/onnxruntime/Makefile +++ b/opt/build/onnxruntime/Makefile @@ -1,12 +1,13 @@ -REDIS_ONNX_VERSION?=1.8.0 -REDIS_ONNX_REPO?=https://github.com/microsoft/onnxruntime +REDIS_ONNX_VERSION?=rel-1.7.2_RCE +REDIS_ONNX_REPO?=https://github.com/redisai/onnxruntime export REDIS_ONNX_VERSION export REDIS_ONNX_REPO PRODUCT=onnxruntime DOCKER_ORG=redislabs -VERSION=${REDIS_ONNX_VERSION} +REDIS_BACKEND_VERSION?=${REDIS_ONNX_VERSION} +export REDIS_VERSION ROOT=. diff --git a/opt/build/onnxruntime/dockerfile.tmpl b/opt/build/onnxruntime/dockerfile.tmpl index 2c19bb2f4..b370b9c68 100755 --- a/opt/build/onnxruntime/dockerfile.tmpl +++ b/opt/build/onnxruntime/dockerfile.tmpl @@ -10,9 +10,6 @@ FROM ubuntu:bionic FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base {% endif %} -ARG ONNXRUNTIME_REPO={{REDIS_ONNX_REPO}} -ARG ONNXRUNTIME_VER={{REDIS_ONNX_VERSION}} - {% include 'apt.yml' %} {% include 'cmake.yml' %} @@ -20,20 +17,20 @@ ARG ONNXRUNTIME_VER={{REDIS_ONNX_VERSION}} # build WORKDIR /build {% if REDIS_GPU is defined %} -ARG BUILDTYPE=MinSizeRel -ARG BUILDARGS="--use_cuda --cudnn_home /usr/local/cuda --cuda_home /usr/local/cuda" +{% set BUILDTYPE = "MinSizeRel" %} +{% set BUILDARGS = "--use_cuda --cudnn_home /usr/local/cuda --cuda_home /usr/local/cuda" %} {% else %} -ARG BUILDTYPE=Release -ARG BUILDARGS +{% set BUILDTYPE = "Release" %} +{% set BUILDARGS = "" %} {% endif %} -ARG BUILDARGS="--config ${BUILDTYPE} --parallel" -RUN git clone --single-branch --branch v${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime +ARG BUILDARGS="--config {{BUILDTYPE}} --parallel" +RUN git clone --single-branch --branch {{REDIS_ONNX_VERSION}} {{REDIS_ONNX_REPO}} onnxruntime WORKDIR /build/onnxruntime RUN git fetch --recurse-submodules -j4 -RUN ./build.sh --config ${BUILDTYPE} ${BUILDARGS} --update --build --build_shared_lib --parallel +RUN ./build.sh --config {{BUILDTYPE}} {{BUILDARGS}} --update --build --build_shared_lib --parallel # package ADD ./pack.sh /build WORKDIR /build -RUN ./pack.sh {{REDIS_ONNX_VERSION}} {{REDIS_ARCH}} ${BUILDTYPE} linux {% if REDIS_GPU is defined %} gpu {% endif %} +RUN ./pack.sh {{REDIS_BACKEND_VERSION}} {{REDIS_ARCH}} {{BUILDTYPE}} Linux {% if REDIS_GPU is defined %} gpu {% endif %} diff --git a/opt/build/onnxruntime/pack.sh b/opt/build/onnxruntime/pack.sh index b82151c28..29102fdb0 100755 --- a/opt/build/onnxruntime/pack.sh +++ b/opt/build/onnxruntime/pack.sh @@ -11,16 +11,20 @@ if [ ${BASEOS} == "MacOS" ]; then BASEDIR=`pwd` # already in the directory on a mac PACKDIR=${BASEDIR}/pack/ else -BASEDIR=onnxrumtime -PACKDIR=${BASEDIR}/../pack/ +BASEDIR=`pwd`/onnxruntime +PACKDIR=${BASEDIR}/pack/ +fi + +target=onnxruntime-${BASEOS,,}-${PLATFORM}-${VER} +if [ ${BASEOS} == "MacOS" ]; then +target=onnxruntime-osx-${PLATFORM}-${VER} fi -target=onnxruntime-${BASEOS}-${PLATFORM}-${VER} if [ ! -z "${VARIANT}" ]; then target=onnxruntime-${BASEOS}-${PLATFORM}-${VARIANT}-${VER} fi -mkdir -p pack/include pack/lib +mkdir -p ${PACKDIR}/include ${PACKDIR}/lib cp ${BASEDIR}/docs/C_API_Guidelines.md ${PACKDIR} cp ${BASEDIR}/LICENSE ${PACKDIR} cp ${BASEDIR}/README.md ${PACKDIR} @@ -49,3 +53,4 @@ fi cd ${PACKDIR}/.. mv pack ${target} tar czf ${target}.tgz ${target}/ +ls -l *.tgz From bb85b48285a06198b2a5c98a3ac0536d7f084a52 Mon Sep 17 00:00:00 2001 From: Chayim Kirshen Date: Sun, 25 Jul 2021 12:11:03 +0000 Subject: [PATCH 11/13] variants --- opt/build/onnxruntime/pack.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/opt/build/onnxruntime/pack.sh b/opt/build/onnxruntime/pack.sh index 29102fdb0..41591fdaa 100755 --- a/opt/build/onnxruntime/pack.sh +++ b/opt/build/onnxruntime/pack.sh @@ -10,18 +10,17 @@ VARIANT="$5" # if set (gpu) if [ ${BASEOS} == "MacOS" ]; then BASEDIR=`pwd` # already in the directory on a mac PACKDIR=${BASEDIR}/pack/ +target_os=osx else BASEDIR=`pwd`/onnxruntime PACKDIR=${BASEDIR}/pack/ +target_os=${BASEOS,,} fi -target=onnxruntime-${BASEOS,,}-${PLATFORM}-${VER} -if [ ${BASEOS} == "MacOS" ]; then -target=onnxruntime-osx-${PLATFORM}-${VER} -fi +target=onnxruntime-${target_os}-${PLATFORM}-${VER} if [ ! -z "${VARIANT}" ]; then - target=onnxruntime-${BASEOS}-${PLATFORM}-${VARIANT}-${VER} + target=onnxruntime-${target_os}-${PLATFORM}-${VARIANT}-${VER} fi mkdir -p ${PACKDIR}/include ${PACKDIR}/lib From a5cc3fd41cd5839cd8858949460cc2aeb93d201b Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Mon, 26 Jul 2021 12:07:51 +0300 Subject: [PATCH 12/13] full CI run without publish --- .circleci/config.yml | 4 +--- get_deps.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d10a3d76d..740706637 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -560,7 +560,6 @@ workflows: <<: *on-any-branch <<: *after-linter - build-and-test-gpu: - <<: *on-integ-branch <<: *after-linter - build-and-test-gpu-for-forked-prs: <<: *on-any-branch @@ -568,14 +567,13 @@ workflows: - platforms-build: context: common <<: *after-build-and-test - <<: *on-master-version-tags-and-dockertests matrix: parameters: osnick: - xenial - bionic lite: - - "REDISAI_LITE=0 publish PUSH_GENERAL=1 OFFICIAL=1" + - "REDISAI_LITE=0 PUSH_GENERAL=1 OFFICIAL=1" - "REDISAI_LITE=1" target: - "CPU=1" diff --git a/get_deps.sh b/get_deps.sh index 3b65f11a4..cc73c21a8 100755 --- a/get_deps.sh +++ b/get_deps.sh @@ -282,7 +282,7 @@ fi ################################################################################### ONNXRUNTIME -ORT_VERSION="1.7.1" +ORT_VERSION="1.7.2" if [[ $WITH_ORT != 0 ]]; then [[ $FORCE == 1 ]] && rm -rf $ONNXRUNTIME From 33ded3e518f8319033ade87a4c4bb0fa016a4f8a Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Mon, 26 Jul 2021 13:33:57 +0300 Subject: [PATCH 13/13] removed jinja since now 1.7.2 --- .circleci/config.yml | 4 +++- docs/developer-backends.md | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 740706637..d10a3d76d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -560,6 +560,7 @@ workflows: <<: *on-any-branch <<: *after-linter - build-and-test-gpu: + <<: *on-integ-branch <<: *after-linter - build-and-test-gpu-for-forked-prs: <<: *on-any-branch @@ -567,13 +568,14 @@ workflows: - platforms-build: context: common <<: *after-build-and-test + <<: *on-master-version-tags-and-dockertests matrix: parameters: osnick: - xenial - bionic lite: - - "REDISAI_LITE=0 PUSH_GENERAL=1 OFFICIAL=1" + - "REDISAI_LITE=0 publish PUSH_GENERAL=1 OFFICIAL=1" - "REDISAI_LITE=1" target: - "CPU=1" diff --git a/docs/developer-backends.md b/docs/developer-backends.md index 26fcff676..22f2f71aa 100644 --- a/docs/developer-backends.md +++ b/docs/developer-backends.md @@ -32,8 +32,6 @@ On ubuntu bionic these can be installed by running: 1. x86\_64 bit linux systems with a GPU -1. jetson devices - **Directory:** opt/build/onnxruntime **Build options:**