Skip to content

Commit

Permalink
v0.23.alpha (#735)
Browse files Browse the repository at this point in the history
* Update version to v0.23.alpha

* Preliminary work on message-action and first message-sink (#701)

* WIP Implement new IoT Message Sinks

* WIP implement new message sinks and message action

* Update preliminary test case

* Updates to message sink and message action (#702)

* Update test-cases and examples to support DS 6.0 migration  (#706)

* WIP Update all tests/examples for DS6.0

* Update all tests/examples for DS6.0

* Document new Action and Sink APIs (#707)

* Update api-ode-action.md

* Update api-reference-list.md

* Update api-reference-list.md

* Update api-sink.md

* Update api-sink.md

* Update api-sink.md

* WIP implement message action and sink (#708)

* Implement Message Broker API (WIP) (#714)

* WIP Implement new Message Broker API

* WIP Implement new Message Broker API

* WIP Implement Message Broker API

* Remove source dependencies on deepstream_*.h files

* Standardize on elementr naming

* Update README.md

* Update Makefile to copy libdsl.so to /usr/local/lib

* Develop script to make-caffemodel engine files

* Update message sink test case and example

* WIP Implement Message Broker API

* WIP Implement Message Broker API

* WIP Implement Message Broker API

* WIP Implement Message Broker API

* Update api-reference-list.md

* Create api-msg-broker.md

* Update api-branch.md

* Update api-branch.md

* Update api-component.md

* Update api-display-type.md

* Update api-infer.md

* Update api-mailer.md

* Update api-ode-action.md

* Update api-ode-area.md

* Update api-ode-trigger.md

* Update api-osd.md

* Update api-pipeline.md

* Update api-player.md

* Update api-pph.md

* Update api-segvisual.md

* Update api-sink.md

* Update api-source.md

* Update api-tap.md

* Update api-tee.md

* Update api-tiler.md

* Update api-tracker.md

* Update api-ws-server.md

* Update building-dsl.md

* Update installing-dependencies.md

* Create proto-lib-azure.md

* WIP Implement Message Broker API

* Update proto-lib-azure.md

* Update api-msg-broker.md

* Implement setup.py install script (#717)

* Add mkdir for container builds (#718)

* V0.23.alpha.docs (#719)

* Update README.md

* Update README.md

* Update README.md

* Update proto-lib-azure.md

* Update proto-lib-azure.md

* Update installing-dependencies.md

* Update building-dsl.md

* Update building-dsl.md

* Update installing-dependencies.md

* Update building-dsl.md

* Update proto-lib-azure.md

* Add files via upload

* Update proto-lib-azure.md

* Update building-dsl.md

* Delete setup.py

* Update make (#721)

* Implement setup.py install script

* Replace make lib w/ sudo make install

* Move CodeLite workspace/project files to .codelite/ subfolder (#722)

* Implement setup.py install script

* Move codelite workspace/project files to subdir

* Implement new Informational Services API (#727)

* Implement setup.py install script

* Implement new DSL Debug API

* Implement DSL Info API

* Implement new Info API

* Implement new Info API

* Create api-info.md

* Update api-pipeline.md

* Update api-player.md

* Update api-source.md

* Update api-tap.md

* Update api-infer.md

* Update api-tracker.md

* Update api-segvisual.md

* Update api-tiler.md

* Update api-tee.md

* Update api-osd.md

* Update api-sink.md

* Update api-pph.md

* Update api-ode-trigger.md

* Update api-ode-action.md

* Update api-ode-area.md

* Update api-display-type.md

* Update api-branch.md

* Update api-component.md

* Update api-mailer.md

* Update api-ws-server.md

* Update api-msg-broker.md

* Update building-dsl.md

* Update installing-dependencies.md

* Update overview.md

* Broker api (#728)

* WIP Implement new Message Broker API

* WIP Implement new Message Broker API

* Implement Message Broker API

* V0.23.alpha.docs (#730)

* Update api-reference-list.md

* Update api-msg-broker.md

* Update proto-lib-azure.md

* Update README.md

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update proto-lib-azure.md

* Add files via upload

* Update proto-lib-azure.md

* Update proto-lib-azure.md

* Update README.md

* Update api-info.md

* Update api-msg-broker.md

* Update api-msg-broker.md

* Update building-dsl.md

* Update proto-lib-azure.md

* Add files via upload

* Add files via upload

* Update proto-lib-azure.md

* Update proto-lib-azure.md

* Update proto-lib-azure.md

* Update api-msg-broker.md

* Update api-sink.md

* Update overview.md

* Update test cases and examples (#733)

* v0.23.alpha.docs (#734)

* Update proto-lib-azure.md

* Update proto-lib-azure.md
  • Loading branch information
rjhowell44 authored Mar 24, 2022
1 parent 74182e6 commit a980573
Show file tree
Hide file tree
Showing 195 changed files with 10,599 additions and 4,341 deletions.
336 changes: 336 additions & 0 deletions .codelite/deepstream-services-library.project

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions .codelite/deepstream-services-library.workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="deepstream-services-library" Database="" Version="10.0.0">
<Project Name="deepstream-services-library" Path="deepstream-services-library.project" Active="Yes"/>
<BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="no">
<Environment/>
<Project Name="deepstream-services-library" ConfigName="Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release" Selected="yes">
<Environment/>
<Project Name="deepstream-services-library" ConfigName="Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
*.gch
*.pch

# Python
*.pyc

# Compiled Dynamic libraries
*.so
*.dylib
Expand All @@ -37,5 +40,9 @@
*.dot
*.jpeg

# CodeLite
*.session
*.tags
*.db

# Directories
test/models/
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/azure-iot-edge-device-create-module.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/azure-iot-edge-device-details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/azure-iot-edge-device-set-modules.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/new-azure-iot-edge-device.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 31 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
################################################################################


APP:= dsl-test-app
APP:= dsl-test-app.exe
LIB:= libdsl

CXX = g++

TARGET_DEVICE = $(shell gcc -dumpmachine | cut -f1 -d -)
USER_SITE = "`python3 -m site --user-site`"

CXX_VERSION:=c++17
DSL_VERSION:='L"v0.22b.alpha"'
DSL_VERSION:='L"v0.23.alpha"'
GLIB_VERSION:=2.0
GSTREAMER_VERSION:=1.0
GSTREAMER_SUB_VERSION:=14
Expand All @@ -51,7 +52,7 @@ SRCS+= $(wildcard ./test/*.cpp)
SRCS+= $(wildcard ./test/api/*.cpp)
SRCS+= $(wildcard ./test/unit/*.cpp)

INCS:= $(wildcard ./src/*.h)
INCS+= $(wildcard ./src/*.h)
INCS+= $(wildcard ./test/*.hpp)

ifeq ($(GSTREAMER_SUB_VERSION),18)
Expand All @@ -70,9 +71,9 @@ OBJS:= $(SRCS:.c=.o)
OBJS:= $(OBJS:.cpp=.o)

CFLAGS+= -I$(INC_INSTALL_DIR) \
-std=$(CXX_VERSION) \
-I$(SRC_INSTALL_DIR)/apps/apps-common/includes \
-I/opt/include \
-std=$(CXX_VERSION) \
-I$(SRC_INSTALL_DIR)/apps/apps-common/includes \
-I/opt/include \
-I/usr/include \
-I/usr/include/gstreamer-$(GSTREAMER_VERSION) \
-I/usr/include/glib-$(GLIB_VERSION) \
Expand All @@ -83,12 +84,18 @@ CFLAGS+= -I$(INC_INSTALL_DIR) \
-I./test \
-I./test/api \
-DDSL_VERSION=$(DSL_VERSION) \
-DDSL_LOGGER_IMP='"DslLogGst.h"'\
-DDSL_LOGGER_IMP='"DslLogGst.h"'\
-DGSTREAMER_SUB_VERSION=$(GSTREAMER_SUB_VERSION) \
-DBUILD_MESSAGE_SINK=$(BUILD_MESSAGE_SINK) \
-DNVDS_DCF_LIB='"$(LIB_INSTALL_DIR)/libnvds_nvdcf.so"' \
-DNVDS_KLT_LIB='"$(LIB_INSTALL_DIR)/libnvds_mot_klt.so"' \
-DNVDS_IOU_LIB='"$(LIB_INSTALL_DIR)/libnvds_mot_iou.so"' \
-DNVDS_MOT_LIB='"$(LIB_INSTALL_DIR)/libnvds_nvmultiobjecttracker.so"' \
-DNVDS_AMQP_PROTO_LIB='L"$(LIB_INSTALL_DIR)/libnvds_amqp_proto.so"' \
-DNVDS_AZURE_PROTO_LIB='L"$(LIB_INSTALL_DIR)/libnvds_azure_proto.so"' \
-DNVDS_AZURE_EDGE_PROTO_LIB='L"$(LIB_INSTALL_DIR)/libnvds_azure_edge_proto"' \
-DNVDS_KAFKA_PROTO_LIB='L"$(LIB_INSTALL_DIR)/libnvds_kafka_proto.so"' \
-DNVDS_REDIS_PROTO_LIB='L"$(LIB_INSTALL_DIR)/libnvds_redis_proto.so"' \
-fPIC

ifeq ($(GSTREAMER_SUB_VERSION),18)
Expand All @@ -113,6 +120,7 @@ LIBS+= -L$(LIB_INSTALL_DIR) \
-lnvbufsurface \
-lnvbufsurftransform \
-lnvdsgst_smartrecord \
-lnvds_msgbroker \
-lglib-$(GLIB_VERSION) \
-lgstreamer-$(GSTREAMER_VERSION) \
-Lgstreamer-video-$(GSTREAMER_VERSION) \
Expand Down Expand Up @@ -162,14 +170,27 @@ $(APP): $(OBJS) Makefile
$(CXX) -o $(APP) $(OBJS) $(LIBS)

lib:
@echo ----------------------------------------------------------------------
@echo -- NOTICE: '"make lib"' has been replaced with '"sudo make install"'
@echo ----------------------------------------------------------------------

install:
if [ ! -d "/tmp/.dsl" ]; then \
mkdir -p /tmp/.dsl; \
chmod -R a+rwX /tmp/.dsl; \
fi
ar rcs $(LIB).a $(OBJS)
ar dv $(LIB).a DslCatch.o $(TEST_OBJS)
$(CXX) -shared $(OBJS) -o $(LIB).so $(LIBS)
cp $(LIB).so examples/python/
cp -f $(LIB).so /usr/local/lib
if [ ! -d $(USER_SITE) ]; then \
mkdir -p $(USER_SITE); \
fi
cp -rf ./dsl.py $(USER_SITE)

so_lib:
debug_lib:
$(CXX) -shared $(OBJS) -o $(LIB).so $(LIBS)
cp $(LIB).so examples/python/

clean:
rm -rf $(OBJS) $(APP) $(LIB).a $(LIB).so $(PCH_OUT)
rm -rf $(OBJS) $(APP) $(LIB).a $(LIB).so $(PCH_OUT)
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/canammex-tech/deepstream-services-library?include_prereleases)](https://github.com/canammex-tech/deepstream-services-library/releases)
[![GitHub license](https://img.shields.io/github/license/Naereen/StrapDown.js.svg)](https://github.com/canammex-tech/deepstream-services-library/blob/master/LICENSE)
[![Documentation Status](https://readthedocs.org/projects/ansicolortags/badge/?version=latest)](https://github.com/canammex-tech/deepstream-services-library/blob/master/docs/overview.md)
[![Ask Me Anything !](https://img.shields.io/badge/Ask%20me-anything-1abc9c.svg)](https://discord.com/channels/750454524849684540/750457019260993636)
[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/prominenceai/deepstream-services-library?include_prereleases)](https://github.com/canammex-tech/deepstream-services-library/releases)
[![GitHub license](https://img.shields.io/github/license/Naereen/StrapDown.js.svg)](https://github.com/prominenceai/deepstream-services-library/blob/master/LICENSE)
[![Documentation Status](https://readthedocs.org/projects/ansicolortags/badge/?version=latest)](https://github.com/prominenceai/deepstream-services-library/blob/master/docs/overview.md)
[![Ask Me Anything!](https://img.shields.io/badge/Ask%20me-anything-1abc9c.svg)](https://github.com/prominenceai/deepstream-services-library/issues/new/choose)

![](/Images/under-construction.png)

Expand Down Expand Up @@ -36,6 +36,8 @@ The DeepStream SDK and DSL use the open source [GStreamer](https://gstreamer.fre

DSL is released under the [MIT License](LICENSE). Contributions are welcome and greatly appreciated. Please review our [code of conduct](/CODE_OF_CONDUCT.md).

***Please report issues!***

## DSL Branching Workflow

![DSL Git Branching Workflow](/Images/dsl-branching-workflow.png)
Expand All @@ -44,7 +46,10 @@ DSL is released under the [MIT License](LICENSE). Contributions are welcome and
2. `Develop` is the next release currently in development. The branch will be named with the next release label.
3. `Feature` all work is done on feature branches, named for the feature under development.

All pull requests should be made against the current `Develop` branch.
All pull requests should be made against the current `Develop` branch.

## Docker
The [deepstream-services-library-docker](https://github.com/prominenceai/deepstream-services-library-docker) repo contain a `Dockerfile`, utility scripts, and instructions to create and run a DSL-DeepStream container, built with the [nvcr.io/nvidia/deepstream-l4t:6.0-triton](https://docs.nvidia.com/metropolis/deepstream/dev-guide/text/DS_docker_containers.html#id2) base image (Jetson).

## Discord
Come join us on [Discord](https://discord.gg/MJvY9jjpAK), an informal place to chat, ask questions, discuss ideas, etc.
Expand Down Expand Up @@ -76,6 +81,8 @@ Come join us on [Discord](https://discord.gg/MJvY9jjpAK), an informal place to c
* [Component](/docs/api-component.md)
* [Mailer](/docs/api-mailer.md)
* [WebSocket Server](/docs/api-ws-server.md)
* [Message Broker](/docs/api-msg-broker.md)
* [Info API](/docs/api-info.md)
* [Examples](/docs/examples.md)
* [C/C++](/docs/examples-cpp.md)
* [Python](/docs/examples-python.md)
Expand Down
2 changes: 2 additions & 0 deletions docs/api-branch.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,5 @@ retval = dsl_branch_component_remove_all('my-branch')
* [Component](/docs/api-component.md)
* [Mailer](/docs/api-mailer.md)
* [WebSocket Server](/docs/api-ws-server.md)
* [Message Broker](/docs/api-msg-broker.md)
* [Info API](/docs/api-info.md)
2 changes: 2 additions & 0 deletions docs/api-component.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,5 @@ retval = dsl_component_nvbuf_mem_type_set_many(
* **Component**
* [Mailer](/docs/api-mailer.md)
* [WebSocket Server](/docs/api-ws-server.md)
* [Message Broker](/docs/api-msg-broker.md)
* [Info API](/docs/api-info.md)
2 changes: 2 additions & 0 deletions docs/api-display-type.md
Original file line number Diff line number Diff line change
Expand Up @@ -608,3 +608,5 @@ retval = dsl_display_type_meta_add('blue-circle', buffer, frame_meta)
* [Component](/docs/api-component.md)
* [Mailer](/docs/api-mailer.md)
* [WebSocket Server](/docs/api-ws-server.md)
* [Message Broker](/docs/api-msg-broker.md)
* [Info API](/docs/api-info.md)
2 changes: 2 additions & 0 deletions docs/api-infer.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,3 +407,5 @@ retval = dsl_infer_primary_pph_remove('my-primary-gie', 'my-pph-handler', `DSL_P
* [Component](/docs/api-component.md)
* [Mailer](/docs/api-mailer.md)
* [WebSocket Server](/docs/api-ws-server.md)
* [Message Broker](/docs/api-msg-broker.md)
* [Info API](/docs/api-info.md)
Loading

0 comments on commit a980573

Please sign in to comment.