Skip to content

Commit

Permalink
delete tensorflow (#1723)
Browse files Browse the repository at this point in the history
  • Loading branch information
datelier authored Jul 6, 2022
1 parent f9c8a6a commit fbe44bc
Show file tree
Hide file tree
Showing 48 changed files with 1 addition and 6,483 deletions.
1 change: 0 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
sudo apt-get update && \
sudo apt-get install -y --no-install-recommends libhdf5-dev
sudo make ngt/install
sudo make tensorflow/install
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand Down
128 changes: 0 additions & 128 deletions .github/workflows/dockers-filter-ingress-tensorflow.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/dockers-image-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,33 +259,3 @@ jobs:
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "trivy-results.sarif"
filter-ingress-tensorflow:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build the Docker image
id: build_image
run: |
make docker/build/filter-ingress-tensorflow
imagename=`make docker/name/filter-ingress-tensorflow`
docker tag ${imagename} ${imagename}:${{ github.sha }}
echo "::set-output name=IMAGE_NAME::${imagename}"
env:
DOCKER_BUILDKIT: 1
- name: Run vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: "${{ steps.build_image.outputs.IMAGE_NAME }}:${{ github.sha }}"
format: "table"
- name: Run vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: "${{ steps.build_image.outputs.IMAGE_NAME }}:${{ github.sha }}"
format: "template"
template: "@/contrib/sarif.tpl"
output: "trivy-results.sarif"
severity: "HIGH,CRITICAL"
- name: Upload Trivy scan results to Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "trivy-results.sarif"
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ run:
- (^|/)hack/benchmark($|/)
- (^|/)pkg/filter/ingress($|/)
- (^|/)internal/core/algorithm/ngt($|/)
- (^|/)internal/core/converter/tensorflow($|/)

output:
format: line-number
Expand Down
21 changes: 1 addition & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ CI_CONTAINER_IMAGE = $(NAME)-ci-container
DEV_CONTAINER_IMAGE = $(NAME)-dev-container
DISCOVERER_IMAGE = $(NAME)-discoverer-k8s
FILTER_GATEWAY_IMAGE = $(NAME)-filter-gateway
FILTER_INGRESS_TF_IMAGE = $(NAME)-filter-ingress-tensorflow
HELM_OPERATOR_IMAGE = $(NAME)-helm-operator
LB_GATEWAY_IMAGE = $(NAME)-lb-gateway
LOADTEST_IMAGE = $(NAME)-loadtest
Expand All @@ -50,8 +49,6 @@ GOPATH := $(eval GOPATH := $(shell go env GOPATH))$(GOPATH)

TEMP_DIR := $(eval TEMP_DIR := $(shell mktemp -d))$(TEMP_DIR)

TENSORFLOW_C_VERSION := $(eval TENSORFLOW_C_VERSION := $(shell cat versions/TENSORFLOW_C_VERSION))$(TENSORFLOW_C_VERSION)

OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION)

KIND_VERSION ?= v0.14.0
Expand Down Expand Up @@ -347,8 +344,7 @@ init: \
git/config/init \
git/hooks/init \
deps \
ngt/install \
tensorflow/install
ngt/install

.PHONY: tools/install
## install development tools
Expand Down Expand Up @@ -487,20 +483,6 @@ ngt/install: /usr/local/include/NGT/Capi.h
rm -rf $(TEMP_DIR)/NGT-$(NGT_VERSION)
ldconfig

.PHONY: tensorflow/install
## install TensorFlow for C
tensorflow/install: /usr/local/lib/libtensorflow.so
ifeq ($(UNAME),Darwin)
/usr/local/lib/libtensorflow.so:
brew install libtensorflow@1
else
/usr/local/lib/libtensorflow.so:
curl -LO https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
tar -C /usr/local -xzf libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
rm -f libtensorflow-cpu-linux-x86_64-$(TENSORFLOW_C_VERSION).tar.gz
ldconfig
endif

.PHONY: lint
## run lints
lint: vet
Expand Down Expand Up @@ -543,7 +525,6 @@ include Makefile.d/k3d.mk
include Makefile.d/k8s.mk
include Makefile.d/kind.mk
include Makefile.d/client.mk
include Makefile.d/ml.mk
include Makefile.d/test.mk
include Makefile.d/tools.mk
include Makefile.d/e2e.mk
39 changes: 0 additions & 39 deletions Makefile.d/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ binary/build: \
cmd/discoverer/k8s/discoverer \
cmd/gateway/lb/lb \
cmd/gateway/filter/filter \
cmd/filter/ingress/tensorflow/tensorflow \
cmd/manager/index/index

cmd/agent/core/ngt/ngt: \
Expand Down Expand Up @@ -201,39 +200,6 @@ cmd/manager/index/index: \
$(dir $@)main.go
$@ -version

cmd/filter/ingress/tensorflow/tensorflow: \
tensorflow/install \
$(GO_SOURCES_INTERNAL) \
$(PBGOS) \
$(shell find ./cmd/filter/ingress/tensorflow -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \
$(shell find ./pkg/filter/ingress/tensorflow -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go')
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
CGO_ENABLED=1 \
CGO_CXXFLAGS="-g -Ofast -march=native" \
CGO_FFLAGS="-g -Ofast -march=native" \
CGO_LDFLAGS="-g -Ofast -march=native" \
GO111MODULE=on \
GOPRIVATE=$(GOPRIVATE) \
go build \
--ldflags "-w \
-extldflags '-pthread -fopenmp -std=gnu++2a -lstdc++ -lm $(EXTLDFLAGS)' \
-X '$(GOPKG)/internal/info.Version=$(VERSION)' \
-X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \
-X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \
-X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \
-X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \
-X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \
-X '$(GOPKG)/internal/info.CGOEnabled=$${CGO_ENABLED}' \
-X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \
-buildid=" \
-a \
-tags "cgo osusergo netgo static_build" \
-trimpath \
-o $@ \
$(dir $@)main.go
$@ -version

.PHONY: binary/build/zip
## build all binaries and zip them
binary/build/zip: \
Expand All @@ -242,7 +208,6 @@ binary/build/zip: \
artifacts/vald-discoverer-k8s-$(GOOS)-$(GOARCH).zip \
artifacts/vald-lb-gateway-$(GOOS)-$(GOARCH).zip \
artifacts/vald-filter-gateway-$(GOOS)-$(GOARCH).zip \
artifacts/vald-filter-ingress-tensorflow-$(GOOS)-$(GOARCH).zip \
artifacts/vald-manager-index-$(GOOS)-$(GOARCH).zip

artifacts/vald-agent-ngt-$(GOOS)-$(GOARCH).zip: cmd/agent/core/ngt/ngt
Expand All @@ -269,7 +234,3 @@ artifacts/vald-manager-index-$(GOOS)-$(GOARCH).zip: cmd/manager/index/index
$(call mkdir, $(dir $@))
zip --junk-paths $@ $<

artifacts/vald-filter-ingress-tensorflow-$(GOOS)-$(GOARCH).zip: cmd/filter/ingress/tensorflow/tensorflow
$(call mkdir, $(dir $@))
zip --junk-paths $@ $<

16 changes: 0 additions & 16 deletions Makefile.d/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ docker/build: \
docker/build/gateway-lb \
docker/build/gateway-filter \
docker/build/manager-index \
docker/build/filter-ingress-tensorflow \
docker/build/helm-operator

.PHONY: docker/name/org
Expand Down Expand Up @@ -131,21 +130,6 @@ docker/build/manager-index:
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER)

.PHONY: docker/name/filter-ingress-tensorflow
docker/name/filter-ingress-tensorflow:
@echo "$(ORG)/$(FILTER_INGRESS_TF_IMAGE)"

.PHONY: docker/build/filter-ingress-tensorflow
## build filter-ingress-tensorflow image
docker/build/filter-ingress-tensorflow:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/filter/ingress/tensorflow/Dockerfile \
-t $(ORG)/$(FILTER_INGRESS_TF_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER)

.PHONY: docker/name/ci-container
docker/name/ci-container:
@echo "$(ORG)/$(CI_CONTAINER_IMAGE)"
Expand Down
42 changes: 0 additions & 42 deletions Makefile.d/ml.mk

This file was deleted.

Empty file added cmd/filter/ingress/.gitkeep
Empty file.
Loading

0 comments on commit fbe44bc

Please sign in to comment.