Skip to content

Commit 4b004ef

Browse files
authored
Revert "[DLStreamer] Release 2025.1.2 (#471)" (#475)
This reverts commit 9e8463f.
1 parent 47b1016 commit 4b004ef

File tree

610 files changed

+2823
-49484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

610 files changed

+2823
-49484
lines changed

.dockerignore

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Test installation on Ubuntu24
2+
on:
3+
schedule:
4+
- cron: '0 12 * * *'
5+
6+
# Declare default permissions as read only.
7+
permissions: read-all
8+
9+
jobs:
10+
install-dlstreamer:
11+
name: Test DLStreamer installation
12+
runs-on: ubuntu-24.04
13+
steps:
14+
- name: Setup runner details
15+
run: |
16+
echo "Hostname: $(hostname)"
17+
echo "CPU Name: $(lscpu | grep 'Model name' | sed 's/Model name:[ \t]*//')"
18+
echo "OS Type: $(uname -o)"
19+
echo "OS codename: $(lsb_release -sc)"
20+
echo "Kernel Version: $(uname -r)"
21+
22+
- name: Checkout repository
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2
24+
with:
25+
path: dlstreamer-repo
26+
27+
- name: Install prerequisites using DLS_install_prerequisites.sh
28+
run: |
29+
chmod +x dlstreamer-repo/scripts/DLS_install_prerequisites.sh
30+
./dlstreamer-repo/scripts/DLS_install_prerequisites.sh
31+
32+
- name: Setup repositories
33+
run: |
34+
sudo -E wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
35+
sudo wget -O- https://eci.intel.com/sed-repos/gpg-keys/GPG-PUB-KEY-INTEL-SED.gpg | sudo tee /usr/share/keyrings/sed-archive-keyring.gpg > /dev/null
36+
sudo echo "deb [signed-by=/usr/share/keyrings/sed-archive-keyring.gpg] https://eci.intel.com/sed-repos/$(source /etc/os-release && echo $VERSION_CODENAME) sed main" | sudo tee /etc/apt/sources.list.d/sed.list
37+
sudo bash -c 'echo -e "Package: *\nPin: origin eci.intel.com\nPin-Priority: 1000" > /etc/apt/preferences.d/sed'
38+
sudo bash -c 'echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/openvino/2025 ubuntu24 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2025.list'
39+
40+
- name: Install DLStreamer
41+
run: |
42+
sudo apt update
43+
sudo apt-get install intel-dlstreamer
44+
45+
- name: Test hello_dlstreamer script
46+
run: |
47+
mkdir -p dlstreamer-repo/test_hello_dlstreamer
48+
cd dlstreamer-repo/test_hello_dlstreamer
49+
/opt/intel/dlstreamer/scripts/hello_dlstreamer.sh file
50+
OUTPUT_FILE_FOUND=0
51+
for file in *.mp4; do
52+
# Check if the file exists and is at least 1kB in size
53+
if [[ -f "$file" && $(stat --printf="%s" "$file") -ge 1024 ]]; then
54+
echo "Valid .mp4 file found: $file"
55+
OUTPUT_FILE_FOUND=1
56+
fi
57+
done
58+
if [[ $OUTPUT_FILE_FOUND -eq 0 ]]; then
59+
echo "No .mp4 file(s) found or it has less than 1kB size."
60+
exit 1
61+
fi
62+
63+
- name: Upload hello_dlstreamer output video
64+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #4.6.2
65+
if: always()
66+
with:
67+
name: hello_dlstreamer_output_video
68+
path: dlstreamer-repo/test_hello_dlstreamer

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CMakeFiles
33
CMakeFiles.txt.user
44
CMakeScripts
55
Testing
6+
Makefile
67
cmake_install.cmake
78
install_manifest.txt
89
compile_commands.json
@@ -22,6 +23,8 @@ cmake-build-*/
2223
# Compiled Dynamic libraries
2324
*.so
2425

26+
# Compiled Static libraries
27+
*.a
2528
# Python's Byte-compiled / optimized / DLL files
2629
__pycache__/
2730
*.py[cod]

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "thirdparty/spdlog"]
22
path = thirdparty/spdlog
33
url = https://github.com/gabime/spdlog.git
4-
[submodule "thirdparty/googletest"]
5-
path = thirdparty/googletest
6-
url = https://github.com/google/googletest.git

CMakeLists.txt

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ cmake_minimum_required(VERSION 3.20)
88

99
project(DL_Streamer C CXX)
1010

11-
if (WIN32)
12-
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
13-
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
14-
endif()
1511

1612
if(NOT(UNIX) AND NOT(WIN32))
1713
message(FATAL_ERROR "Only UNIX and Windows supported")
@@ -24,8 +20,8 @@ endif()
2420

2521
# Define version
2622
set(VERSION_MAJOR 2025)
27-
set(VERSION_MINOR 1)
28-
set(VERSION_PATCH 2)
23+
set(VERSION_MINOR 0)
24+
set(VERSION_PATCH 1)
2925

3026
if (NOT DEFINED GIT_INFO OR "${GIT_INFO}" STREQUAL "")
3127
set(GIT_INFO "0")
@@ -35,7 +31,7 @@ endif()
3531
configure_file(cmake/version.txt.in version.txt)
3632

3733
set(PRODUCT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
38-
set(PLUGIN_VERSION ${PRODUCT_VERSION})
34+
set(PLUGIN_VERSION ${PRODUCT_VERSION}.${GIT_INFO})
3935

4036
# Propagate version to plugins
4137

@@ -120,22 +116,21 @@ include(CMakeDependentOption)
120116
option(ENABLE_SAMPLES "Parameter to enable samples building" ON)
121117
cmake_dependent_option(TREAT_WARNING_AS_ERROR "Treat build warnings as errors" ON "UNIX" OFF)
122118
cmake_dependent_option(ENABLE_ITT "Enable ITT for tracing" ON "UNIX AND NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL aarch64" OFF)
123-
cmake_dependent_option(ENABLE_VAAPI "Parameter to enable VAAPI for image pre-processing" ON "UNIX" ON)
119+
cmake_dependent_option(ENABLE_VAAPI "Parameter to enable VAAPI for image pre-processing" ON "UNIX" OFF)
124120
cmake_dependent_option(ENABLE_PAHO_INSTALLATION "Enables paho-mqtt3c installation" OFF "UNIX" OFF)
125-
cmake_dependent_option(ENABLE_TESTS "Parameter to enable tests building" ON "UNIX" OFF)
126121
cmake_dependent_option(ENABLE_RDKAFKA_INSTALLATION "Enables rdkafka installation" OFF "UNIX" OFF)
127122
option(ENABLE_AUDIO_INFERENCE_ELEMENTS "Enables audio inference elements" ON)
128123
option(ENABLE_VPUX "Enables VPUX specific features" OFF)
129-
option(ENABLE_GENAI "Enables GenAI elements" OFF)
124+
125+
130126
message("ENABLE_PAHO_INSTALLATION=${ENABLE_PAHO_INSTALLATION}")
131127
message("ENABLE_RDKAFKA_INSTALLATION=${ENABLE_RDKAFKA_INSTALLATION}")
132128

133129
# Define compiler flags
134130

135131
if(WIN32)
136132
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
137-
# disabled some warnings to reduce log size
138-
set(CMAKE_CXX_FLAGS_RELEASE "/O2 -wd4005 -wd4267 -wd4297 -wd4244 -wd4273 -wd4141 -wd4805")
133+
set(CMAKE_CXX_FLAGS_RELEASE "/O2")
139134

140135
set (CMAKE_C_STANDARD 11)
141136
set (CMAKE_CXX_STANDARD 23)
@@ -187,6 +182,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_CONFIG_H")
187182
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_CONFIG_H")
188183

189184

185+
190186
# Find common packages
191187

192188
find_package(Threads REQUIRED)
@@ -199,7 +195,9 @@ link_directories(${GSTREAMER_LIBRARY_DIRS})
199195

200196
add_subdirectory(include/dlstreamer)
201197
add_subdirectory(include/dlstreamer/gst/videoanalytics)
202-
add_subdirectory(src)
198+
if(NOT(WIN32))
199+
add_subdirectory(src)
200+
endif()
203201
add_subdirectory(src/monolithic)
204202
add_subdirectory(thirdparty)
205203
add_subdirectory(python)
@@ -211,7 +209,4 @@ if(${ENABLE_SAMPLES})
211209
#add_subdirectory(samples/ffmpeg_dpcpp/rgb_to_grayscale)
212210
endif()
213211

214-
if(${ENABLE_TESTS} AND NOT(WIN32))
215-
enable_testing()
216-
add_subdirectory(tests/unit_tests)
217-
endif()
212+

0 commit comments

Comments
 (0)