From dded66764dbce3f5a70bbcce21eb8de264e404f3 Mon Sep 17 00:00:00 2001
From: Eclipse95 <9960386+eclipse95@users.noreply.github.com>
Date: Fri, 17 May 2024 15:44:35 +0200
Subject: [PATCH 1/3] add missing required packages to setup.py
---
setup.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/setup.py b/setup.py
index 8519fb11..0c147fe9 100644
--- a/setup.py
+++ b/setup.py
@@ -32,4 +32,10 @@ setuptools.setup(
"deep learning",
"machine learning"
],
+ install_requires=[
+ "deprecated",
+ "tensorflow",
+ "numpy",
+ "tqdm",
+ ]
)
--
GitLab
From 5e9bda552cb96a841649bd999f601ab15de1dc1a Mon Sep 17 00:00:00 2001
From: Eclipse95 <9960386+eclipse95@users.noreply.github.com>
Date: Fri, 17 May 2024 15:46:54 +0200
Subject: [PATCH 2/3] set C++17 for the project
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a4d646a..ec8905bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ project(OTBTensorflow)
# Use Tensorflow, or not
option(OTB_USE_TENSORFLOW "Enable Tensorflow dependent applications" OFF)
+set(CMAKE_CXX_STANDARD 17)
if(OTB_USE_TENSORFLOW)
message("Tensorflow support enabled")
--
GitLab
From 0085401af748fe908daaf338aaf657f4111ee08b Mon Sep 17 00:00:00 2001
From: Eclipse95 <9960386+eclipse95@users.noreply.github.com>
Date: Fri, 17 May 2024 15:51:06 +0200
Subject: [PATCH 3/3] remove the dirty hack
---
Dockerfile | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 904431e3..7a4bac9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,20 +104,7 @@ RUN apt-get update -y \
&& git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \
&& cd otb && git checkout $OTB
-# <---------------------------------------- Begin dirty hack
-# This is a dirty hack for release 4.0.0alpha
-# We have to wait that OTB moves from C++14 to C++17
-# See https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2338
-RUN cd /src/otb/otb \
- && sed -i 's/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 17/g' CMakeLists.txt \
- && echo "" > Modules/Core/ImageManipulation/test/CMakeLists.txt \
- && echo "" > Modules/Core/Conversion/test/CMakeLists.txt \
- && echo "" > Modules/Core/Indices/test/CMakeLists.txt \
- && echo "" > Modules/Core/Edge/test/CMakeLists.txt \
- && echo "" > Modules/Core/ImageBase/test/CMakeLists.txt \
- && echo "" > Modules/Learning/DempsterShafer/test/CMakeLists.txt \
-# <---------------------------------------- End dirty hack
- && cd .. \
+RUN cd /src/otb/ \
&& mkdir -p build \
&& cd build \
&& if $OTBTESTS; then \
--
GitLab