Skip to content

Commit

Permalink
Merge pull request #193 from grycap/devel
Browse files Browse the repository at this point in the history
dCache integration
  • Loading branch information
catttam authored Mar 14, 2023
2 parents b934b62 + 7b4f11c commit 0417e37
Show file tree
Hide file tree
Showing 13 changed files with 283 additions and 693 deletions.
2 changes: 1 addition & 1 deletion examples/fire-detection/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y && \
apt-get upgrade -y && \
apt-get install -y git curl zip jq \
apt-get install -y git curl zip jq libjpeg-dev \
libgl1-mesa-glx \
libglib2.0-0 \
python3 python3-pip
Expand Down
1 change: 1 addition & 0 deletions examples/fire-detection/inference_ff_oscar.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ def process_sp(args, small_frame, np_transforms, model):
print(f'\n>>>>TensorRT runs only on gpu. Exit.')
exit()

torch.set_num_threads(1)
# model load
if args.model == "shufflenetonfire":
model = shufflenetv2.shufflenet_v2_x0_5(
Expand Down
130 changes: 66 additions & 64 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,110 +3,112 @@ module github.com/grycap/oscar/v2
go 1.18

require (
github.com/aws/aws-sdk-go v1.44.22
github.com/gin-gonic/gin v1.7.7
github.com/aws/aws-sdk-go v1.44.189
github.com/gin-gonic/gin v1.8.2
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/goccy/go-yaml v1.9.5
github.com/go-playground/validator/v10 v10.11.2 // indirect
github.com/goccy/go-yaml v1.9.8
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/grycap/cdmi-client-go v0.1.1
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
github.com/minio/madmin-go v1.3.14
github.com/minio/minio-go/v7 v7.0.27 // indirect
github.com/openfaas/faas-netes v0.0.0-20220526122157-9e94296db90c
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/minio/madmin-go v1.7.5
github.com/minio/minio-go/v7 v7.0.47 // indirect
github.com/openfaas/faas-netes v0.0.0-20230128105321-d45bc4d2a2b1
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.12.2
github.com/shirou/gopsutil/v3 v3.22.4 // indirect
github.com/tinylib/msgp v1.1.6 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
gopkg.in/ini.v1 v1.66.4 // indirect
k8s.io/api v0.24.1
k8s.io/apimachinery v0.24.1
k8s.io/client-go v0.24.1
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
github.com/prometheus/client_golang v1.14.0
github.com/shirou/gopsutil/v3 v3.22.12 // indirect
github.com/tinylib/msgp v1.1.8 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.4.0
gopkg.in/ini.v1 v1.67.0 // indirect
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
k8s.io/klog/v2 v2.90.0 // indirect
k8s.io/utils v0.0.0-20230115233650-391b47cb4029 // indirect
)

require (
github.com/fatih/color v1.13.0 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/rs/xid v1.4.0 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
golang.org/x/time v0.3.0 // indirect
k8s.io/kube-openapi v0.0.0-20230127205639-68031ae9242a // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

require (
github.com/apache/yunikorn-core v1.0.0
github.com/apache/yunikorn-core v1.1.0
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
github.com/coreos/go-oidc/v3 v3.2.0
knative.dev/serving v0.31.0
github.com/coreos/go-oidc/v3 v3.5.0
knative.dev/serving v0.36.0
)

require (
github.com/apache/yunikorn-scheduler-interface v1.0.0 // indirect
github.com/apache/yunikorn-scheduler-interface v1.2.0 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/goccy/go-json v0.10.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-containerregistry v0.9.0 // indirect
github.com/google/go-containerregistry v0.13.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/philhofer/fwd v1.1.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/common v0.34.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/secure-io/sio-go v0.3.1 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/ugorji/go/codec v1.2.8 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220525015930-6ca3db687a9d // indirect
google.golang.org/grpc v1.46.2 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa // indirect
google.golang.org/grpc v1.52.3 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73 // indirect
knative.dev/pkg v0.0.0-20220525153005-18f69958870f // indirect
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
knative.dev/networking v0.0.0-20230123233838-db2bcbea2560 // indirect
knative.dev/pkg v0.0.0-20230125083639-408ad0773f47 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit 0417e37

Please sign in to comment.