From f3afe7770ecb38b3a990c3cde2c2d2ff9e235daf Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 6 Jun 2024 16:43:33 +0200
Subject: [PATCH] clean out the split rendering handling parts from ci config

---
 .gitlab-ci.yml | 52 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3e86272ea..399cb6f22e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,11 +174,6 @@ stages:
   - git pull
   - Pop-Location
 
-.enable-split-rendering: &enable-split-rendering
-# automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment
-  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)[[:space:]]*\*\//\1/g" ./lib_com/options.h
-  - sed -i.bak -e "s/\/\/[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)/\1/g"        ./lib_com/options.h
-
 .disable-limiter: &disable-limiter
 # automatically enable #define DISABLE_LIMITER in options.h, handling both /**/-comment and //-comment
   - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*DISABLE_LIMITER\)[[:space:]]*\*\//\1/g" ./lib_com/options.h
@@ -460,30 +455,6 @@ build-codec-sanitizers-linux:
     - *activate-Werror-linux
     - bash ci/build_codec_sanitizers_linux.sh
 
-build-codec-include-split-linux-make:
-  extends:
-    - .build-job-linux
-    - .rules-basis
-  script:
-    - *print-common-info
-    - *enable-split-rendering
-    - *activate-Werror-linux
-    - make -j INCLUDE_SPLIT=1
-
-build-codec-include-split-linux-cmake:
-  extends:
-    - .build-job-linux
-    - .rules-basis
-  script:
-    - *print-common-info
-    - *enable-split-rendering
-    - *activate-Werror-linux
-    - mkdir build
-    - cd build
-    - cmake .. -DINCLUDE_SPLIT=1
-    - cd ..
-    - make -C build -j
-
 build-codec-windows-cmake:
   extends:
     - .build-job-windows
@@ -494,19 +465,6 @@ build-codec-windows-cmake:
     - cmake -G "Visual Studio 15 2017" . -Bbuild
     - cmake --build build -j
 
-build-codec-windows-include-split-cmake:
-  extends:
-    - .build-job-windows
-    - .rules-basis
-  script:
-    - *print-common-info-windows
-    - *activate-WX-windows
-    - get-content .\lib_com\options.h | %{$_ -replace "/\*#define[\s]*SPLIT_REND_WITH_HEAD_ROT[\s]*\*/", "#define SPLIT_REND_WITH_HEAD_ROT"} | set-content -Path ./options_patched.h
-    - rm ./lib_com/options.h
-    - mv ./options_patched.h ./lib_com/options.h
-    - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild
-    - cmake --build build -j
-
 build-codec-windows-msbuild:
   extends:
     - .build-job-windows
@@ -792,8 +750,7 @@ split-rendering-smoke-test:
   needs: ["build-codec-linux-make"]
   stage: test
   script:
-    - *enable-split-rendering
-    - make -j INCLUDE_SPLIT=1
+    - make -j
     - testcase_timeout=10
     - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --testcase_timeout=$testcase_timeout
   artifacts:
@@ -814,7 +771,6 @@ lc3-wrapper-unit-test:
   needs: ["build-codec-linux-cmake"]
   stage: test
   script:
-    - *enable-split-rendering
     - cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
     - cmake --build cmake-build -- -j
     - scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test
@@ -848,8 +804,7 @@ split-rendering-pytest-on-merge-request:
     - echo "Building reference codec at commit $target_commit"
 
     # build reference binaries
-    - *enable-split-rendering
-    - make -j INCLUDE_SPLIT=1
+    - make -j
     - mv IVAS_cod IVAS_cod_ref
     - mv IVAS_dec IVAS_dec_ref
     - mv IVAS_rend IVAS_rend_ref
@@ -865,8 +820,7 @@ split-rendering-pytest-on-merge-request:
     - git restore lib_com/options.h # Revert changes back before checking out another branch to avoid conflicts
     - git checkout $source_branch_commit_sha
     - make clean
-    - *enable-split-rendering
-    - make -j INCLUDE_SPLIT=1
+    - make -j
 
     ### Run test using scripts and input from main
     - if [ $ref_using_main == 1 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts
-- 
GitLab