Skip to content

Commit dbe1f26

Browse files
committed
Merge branch 'main' into mme_optimizations
2 parents 8b5e6ad + 7b212e2 commit dbe1f26

File tree

214 files changed

+201547
-6313
lines changed

Some content is hidden

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

214 files changed

+201547
-6313
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ indexing, and audio analysis.
126126
and forecasting on sensor time-series data.
127127

128128
- [Multi-level Video Understanding Microservice](./microservices/multilevel-video-understanding/)
129-
129+
130130
Microservices providing a multi-level, temporal-enhanced approach to generate high quality summaries for video files, especially for long videos.
131131

132132
### Data Preparation and Retrieval 
@@ -293,17 +293,17 @@ structured and time-series data.
293293
with rapid training and low-latency inference.
294294

295295
### Edge-device Enablement Framework (EEF)
296-
A comprehensive framework providing hardware abstraction, device management,
297-
and deployment tools for edge AI applications. Simplifies cross-platform
298-
development and enables consistent deployment across diverse edge hardware
296+
A comprehensive framework providing hardware abstraction, device management,
297+
and deployment tools for edge AI applications. Simplifies cross-platform
298+
development and enables consistent deployment across diverse edge hardware
299299
architectures.
300300

301301
- [Edge-device Enablement Framework](./frameworks/edgedevice-enablement-framework)
302302

303-
Framework for Intel® platform enablement and streamlining
303+
Framework for Intel® platform enablement and streamlining
304304
edge AI application deployment across heterogeneous device platforms.
305305

306-
306+
307307
## Contribute
308308

309309
To learn how to contribute to the project, see
@@ -329,4 +329,4 @@ The **Edge AI Libraries** project is licensed under the [APACHE 2.0](./LICENSE)
329329
|:----------|:--------|
330330
| Dataset Management Framework (Datumaro) | [MIT License](https://github.com/open-edge-platform/datumaro/blob/develop/LICENSE) |
331331
| Intel® Geti™ | [Limited Edge Software Distribution License](https://github.com/open-edge-platform/geti/blob/main/LICENSE) |
332-
| Deep Learning Streamer | [MIT License](https://github.com/open-edge-platform/edge-ai-libraries/blob/main/libraries/dl-streamer/LICENSE) |
332+
| Deep Learning Streamer | [MIT License](https://github.com/open-edge-platform/dlstreamer/blob/main/LICENSE) |

libraries/datumaro

Submodule datumaro updated 29 files

libraries/dlstreamer

Submodule dlstreamer updated 173 files

libraries/edge-control-libraries/fieldbus/ethercat-masterstack/dkms.conf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PACKAGE_NAME="${DKMS_PACKAGE_NAME}"
22
PACKAGE_VERSION="${DKMS_PACKAGE_VERSION}"
3-
BUILD_EXCLUSIVE_KERNEL="^((5\.(1[05])\.)|(6\.[16]\.)|(6\.12\.))"
3+
BUILD_EXCLUSIVE_KERNEL="^((5\.(1[05])\.)|(6\.[16]\.)|(6\.1[278]\.))"
44
#Extract kernel version substring
55
# i.e 5.15.0-116-generic ==> 5.15.0
66
# 5.15.129-rt67-intel-ese-standard-lts-rt ==> 5.15.129
@@ -22,17 +22,19 @@ BUILT_MODULE_NAME[2]="ec_igc"
2222
BUILT_MODULE_LOCATION[2]="devices/igc"
2323
DEST_MODULE_LOCATION[2]="/updates/dkms"
2424

25-
if [ "$VERSION" -eq 5 -a "$PATCHLEVEL" -eq 15 -a "$SUBLEVEL" -eq 0 ]; then
26-
# Any 5.15.0-yyy-generic ==> 5.15.0 won't build ec_dwmac_intel with linux-header-generic
25+
if [ "$VERSION" -eq 5 -a "$PATCHLEVEL" -eq 15 -a "$SUBLEVEL" -eq 0 ] || [ "$VERSION" -eq 6 -a "$PATCHLEVEL" -gt 12 ] || [ "$VERSION" -gt 6 ]; then
26+
# Any 5.15.0-yyy-generic ==> 5.15.0 or any 6.13 and above kernel won't build ec_dwmac_intel with linux-header-generic
2727
MAKE[0]="echo 'ignore dwmac-intel dkms build for $kernelver' && ./configure --with-devices=8 --enable-kernel --with-linux-dir=${kernel_source_dir} --disable-eoe --enable-sii-assign --enable-hrtimer --enable-cycles --enable-igb --enable-igc --disable-generic --disable-8139too --disable-r8169 --disable-e100 --disable-e1000 --disable-e1000e --disable-tool --disable-userlib && make -C ${kernel_source_dir} modules M=${dkms_tree}/${DKMS_PACKAGE_NAME}/${PACKAGE_VERSION}/build"
28+
MAKE_MATCH[1]="dovetail"
29+
MAKE[1]="./configure --with-devices=8 --enable-kernel --with-linux-dir=${kernel_source_dir} --disable-eoe --enable-sii-assign --enable-hrtimer --enable-cycles --enable-igb --enable-igc --disable-generic --disable-8139too --disable-r8169 --disable-e100 --disable-e1000 --disable-e1000e --disable-tool --disable-userlib --enable-rtdm --with-xenomai-dir=/usr && make -C ${kernel_source_dir} modules M=${dkms_tree}/${DKMS_PACKAGE_NAME}/${PACKAGE_VERSION}/build"
2830
else
2931
BUILT_MODULE_NAME[3]="ec_dwmac_intel"
3032
BUILT_MODULE_LOCATION[3]="devices/stmmac"
3133
DEST_MODULE_LOCATION[3]="/updates/dkms"
3234

3335
MAKE[0]="./configure --with-devices=8 --enable-kernel --with-linux-dir=${kernel_source_dir} --disable-eoe --enable-sii-assign --enable-hrtimer --enable-cycles --enable-igb --enable-igc --enable-dwmac-intel --disable-generic --disable-8139too --disable-r8169 --disable-e100 --disable-e1000 --disable-e1000e --disable-tool --disable-userlib && make -C ${kernel_source_dir} modules M=${dkms_tree}/${DKMS_PACKAGE_NAME}/${PACKAGE_VERSION}/build"
36+
MAKE_MATCH[1]="dovetail"
37+
MAKE[1]="./configure --with-devices=8 --enable-kernel --with-linux-dir=${kernel_source_dir} --disable-eoe --enable-sii-assign --enable-hrtimer --enable-cycles --enable-igb --enable-igc --enable-dwmac-intel --disable-generic --disable-8139too --disable-r8169 --disable-e100 --disable-e1000 --disable-e1000e --disable-tool --disable-userlib --enable-rtdm --with-xenomai-dir=/usr && make -C ${kernel_source_dir} modules M=${dkms_tree}/${DKMS_PACKAGE_NAME}/${PACKAGE_VERSION}/build"
3438
fi
3539

36-
MAKE_MATCH[1]="dovetail"
37-
MAKE[1]="./configure --with-devices=8 --enable-kernel --with-linux-dir=${kernel_source_dir} --disable-eoe --enable-sii-assign --enable-hrtimer --enable-cycles --enable-igb --enable-igc --enable-dwmac-intel --disable-generic --disable-8139too --disable-r8169 --disable-e100 --disable-e1000 --disable-e1000e --disable-tool --disable-userlib --enable-rtdm --with-xenomai-dir=/usr && make -C ${kernel_source_dir} modules M=${dkms_tree}/${DKMS_PACKAGE_NAME}/${PACKAGE_VERSION}/build"
38-
AUTOINSTALL="yes"
40+
AUTOINSTALL="yes"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 3b1de85dedc3344d3d443446f07b1594c0c9fc14 Mon Sep 17 00:00:00 2001
2+
From: "Zhang, Wei E" <wei.e.zhang@intel.com>
3+
Date: Wed, 11 Feb 2026 09:17:42 +0800
4+
Subject: [PATCH 1/7] Switched from hrtimer_init() to hrtimer_setup() with
5+
Linux 6.15.
6+
7+
CherryPick from https://gitlab.com/etherlab.org/ethercat/-/commit/354f1493cc2a73bd4e5545f60670dfd7fdcf914b
8+
---
9+
devices/ccat/netdev.c | 5 +++++
10+
master/master.c | 5 +++++
11+
2 files changed, 10 insertions(+)
12+
13+
diff --git a/devices/ccat/netdev.c b/devices/ccat/netdev.c
14+
index b122b790..59bdb7c2 100644
15+
--- a/devices/ccat/netdev.c
16+
+++ b/devices/ccat/netdev.c
17+
@@ -862,8 +862,13 @@ static int ccat_eth_open(struct net_device *dev)
18+
struct ccat_eth_priv *const priv = netdev_priv(dev);
19+
20+
if (!priv->ecdev) {
21+
+#if LINUX_KERNEL_CODE >= KERNEL_VERSION(6, 15, 0)
22+
+ hrtimer_setup(&priv->poll_timer, poll_timer_callback,
23+
+ CLOCK_MONOTONIC, HRTIMER_MODE_REL);
24+
+#else
25+
hrtimer_init(&priv->poll_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
26+
priv->poll_timer.function = poll_timer_callback;
27+
+#endif
28+
hrtimer_start(&priv->poll_timer, POLL_TIME, HRTIMER_MODE_REL);
29+
}
30+
return 0;
31+
diff --git a/master/master.c b/master/master.c
32+
index 1b4947dd..29778860 100644
33+
--- a/master/master.c
34+
+++ b/master/master.c
35+
@@ -1607,8 +1607,13 @@ void ec_master_nanosleep(const unsigned long nsecs)
36+
struct hrtimer_sleeper t;
37+
enum hrtimer_mode mode = HRTIMER_MODE_REL;
38+
39+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
40+
+ hrtimer_setup(&t.timer, ec_master_nanosleep_wakeup,
41+
+ CLOCK_MONOTONIC, mode);
42+
+#else
43+
hrtimer_init(&t.timer, CLOCK_MONOTONIC, mode);
44+
t.timer.function = ec_master_nanosleep_wakeup;
45+
+#endif
46+
t.task = current;
47+
hrtimer_set_expires(&t.timer, ktime_set(0, nsecs));
48+
49+
--
50+
2.34.1
51+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 3de43fd3d056e16df539944a805a9dc4268b3657 Mon Sep 17 00:00:00 2001
2+
From: "Zhang, Wei E" <wei.e.zhang@intel.com>
3+
Date: Wed, 11 Feb 2026 09:20:53 +0800
4+
Subject: [PATCH 2/7] Implemented new timer interface for mini example since
5+
kernel 6.15.
6+
7+
CherryPick from https://gitlab.com/etherlab.org/ethercat/-/commit/240080f11062cca42f9132cd32fad3b993502665
8+
---
9+
examples/mini/mini.c | 4 ++++
10+
1 file changed, 4 insertions(+)
11+
12+
diff --git a/examples/mini/mini.c b/examples/mini/mini.c
13+
index 1ebadd87..05946b4e 100644
14+
--- a/examples/mini/mini.c
15+
+++ b/examples/mini/mini.c
16+
@@ -525,7 +525,11 @@ void __exit cleanup_mini_module(void)
17+
{
18+
printk(KERN_INFO PFX "Stopping...\n");
19+
20+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
21+
+ timer_delete_sync(&timer);
22+
+#else
23+
del_timer_sync(&timer);
24+
+#endif
25+
26+
#if EXTERNAL_MEMORY
27+
kfree(domain1_pd);
28+
--
29+
2.34.1
30+

0 commit comments

Comments
 (0)