From 3aebf70a14885d4fbac1f76b18aa77bec9774179 Mon Sep 17 00:00:00 2001
From: Mikko Ylinen <mikko.ylinen@intel.com>
Date: Wed, 19 Jul 2023 08:58:44 +0300
Subject: [PATCH] demo: update accel-config-demo

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
---
 demo/accel-config-demo/Dockerfile | 10 ++----
 demo/accel-config-demo/dml.patch  | 51 -------------------------------
 2 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 demo/accel-config-demo/dml.patch

diff --git a/demo/accel-config-demo/Dockerfile b/demo/accel-config-demo/Dockerfile
index e003bd26..2bfb2820 100644
--- a/demo/accel-config-demo/Dockerfile
+++ b/demo/accel-config-demo/Dockerfile
@@ -35,19 +35,15 @@ RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
     ./configure -q --libdir=/usr/lib64 --enable-test=yes --disable-docs && \
     make install
 
-COPY dml.patch /
-RUN cd / && git clone --recurse-submodules --branch v0.1.9-beta --depth 1 https://github.com/intel/DML.git && \
+RUN cd / && git clone --recurse-submodules --branch v1.1.0 --depth 1 https://github.com/intel/DML.git && \
     mkdir DML/build && cd DML/build && \
-    patch -d .. -p1 < /dml.patch && \
     cmake .. && \
     make install && \
     mv -v /usr/local/bin/tests /usr/local/bin/dml_tests && \
-    mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt && \
-    mv -v /usr/local/bin/job_api_samples /usr/local/bin/dml_job_api_samples
+    mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt
 
-RUN cd / && git clone --recursive --depth 1 --branch v1.0.0 https://github.com/intel/qpl.git && \
+RUN cd / && git clone --recursive --depth 1 --branch v1.2.0 https://github.com/intel/qpl.git && \
     mkdir qpl/build && cd qpl/build && \
-    sed -i '10i #include <stdexcept>' ../tools/benchmarks/include/types.hpp && \
     cmake -DLOG_HW_INIT=ON .. && \
     make install
 
diff --git a/demo/accel-config-demo/dml.patch b/demo/accel-config-demo/dml.patch
deleted file mode 100644
index aa6337a3..00000000
--- a/demo/accel-config-demo/dml.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 31be752ada72f85b2eca9b5a3eef8c41dedb4ad6 Mon Sep 17 00:00:00 2001
-From: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
-Date: Wed, 28 Dec 2022 17:21:15 +0200
-Subject: [PATCH] tests: Ass includes in order to compile with gcc 11, gcc 12
-
-Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
----
- include/dml/detail/ml/buffer.hpp     | 1 +
- tests/common/t_utility_functions.hpp | 1 +
- tests/utils/include/utils/memory.hpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/include/dml/detail/ml/buffer.hpp b/include/dml/detail/ml/buffer.hpp
-index 8f2f529..d59514c 100644
---- a/include/dml/detail/ml/buffer.hpp
-+++ b/include/dml/detail/ml/buffer.hpp
-@@ -10,6 +10,7 @@
- #include <dml/detail/ml/allocator.hpp>
- #include <dml/detail/ml/utils.hpp>
- #include <memory>
-+#include <utility>
- 
- namespace dml::detail::ml
- {
-diff --git a/tests/common/t_utility_functions.hpp b/tests/common/t_utility_functions.hpp
-index c445cb7..caaf411 100644
---- a/tests/common/t_utility_functions.hpp
-+++ b/tests/common/t_utility_functions.hpp
-@@ -7,6 +7,7 @@
- #ifndef DML_T_UTILITY_FUNCTIONS_HPP
- #define DML_T_UTILITY_FUNCTIONS_HPP
- 
-+#include <stdlib.h>
- #include <vector>
- #include <cstdint>
- 
-diff --git a/tests/utils/include/utils/memory.hpp b/tests/utils/include/utils/memory.hpp
-index 4f3cdcf..e408cd9 100644
---- a/tests/utils/include/utils/memory.hpp
-+++ b/tests/utils/include/utils/memory.hpp
-@@ -12,6 +12,7 @@
- #include <memory>
- #include <vector>
- #include <ostream>
-+#include <utility>
- 
- namespace dml::testing
- {
--- 
-2.39.0
-