From a90c45da590f9fa01bf4320cf53d1caf32a9051e Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Fri, 18 Apr 2025 14:13:14 +0000
Subject: [PATCH] Update gitlabci to use previously defined beofre_script and
update gitignore to remove quantization_version.h
---
.gitignore | 3 +--
.gitlab-ci.yml | 27 +++++++++++----------------
include/aidge/quantization_version.h | 11 -----------
3 files changed, 12 insertions(+), 29 deletions(-)
delete mode 100644 include/aidge/quantization_version.h
diff --git a/.gitignore b/.gitignore
index ba5c593..57409a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@
# C++ Build
build*/
install*/
-include/aidge/backend/quantization_version.h
-
+include/aidge/quantization_version.h
# VSCode
.vscode
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4256774..1215038 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,36 +12,31 @@ stages:
- deploy
include:
- - project: 'eclipse/aidge/gitlab_shared_files'
+ - project: 'eclipse/aidge/gitlab_shared_files'
ref: 'main'
- file:
+ file:
#Â choose which jobs to run by including the corresponding files.
- '.gitlab/ci/ubuntu_cpp.gitlab-ci.yml'
- '.gitlab/ci/ubuntu_python.gitlab-ci.yml'
- - '.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml'
-
+ - '.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml'
+
# - '.gitlab/ci/windows_cpp.gitlab-ci.yml'
- # - '.gitlab/ci/windows_python.gitlab-ci.yml'
- # - '.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml'
+ # - '.gitlab/ci/windows_python.gitlab-ci.yml'
+ # - '.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml'
test:ubuntu_python:
before_script:
- - !reference [.retrieve_deps:apt, script]
- - source venv/bin/activate
- - python -m pip install numpy unittest-xml-reporting
- - python -m pip list
+ - !reference [.setup:test:ubuntu:python, before_script]
- DEPS_NAMES=("aidge_onnx")
- DEPENDENCY_JOB="build:ubuntu_python"
- !reference [.ubuntu:download:artifacts, script]
coverage:ubuntu_python:
- before_script:
- - !reference [.retrieve_deps:apt, script]
- - source venv/bin/activate
- - python -m pip install numpy coverage
+ before_script:
+ - !reference [.setup:coverage:ubuntu_python, before_script]
- DEPS_NAMES=("aidge_onnx")
- DEPENDENCY_JOB="build:ubuntu_python"
- !reference [.ubuntu:download:artifacts, script]
@@ -65,12 +60,12 @@ release:pip:ubuntu:
# # Install dependencies
# - choco install cmake.install --installargs '"ADD_CMAKE_TO_PATH=System"' -Y
# - choco install git -Y
-# - choco install python --version=$python_version -Y
+# - choco install python --version=$python_version -Y
# # Update PATH
# - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
# - python -m pip install cibuildwheel==2.17.0
# # Download repositories
# - $DEPS_NAMES = "aidge_core","aidge_backend_cpu","aidge_backend_cuda","aidge_onnx"
# - $DEPENDENCY_JOB="build:windows_python"
-# - !reference [.windows:download:repositories, script]
+# - !reference [.windows:download:repositories, script]
diff --git a/include/aidge/quantization_version.h b/include/aidge/quantization_version.h
deleted file mode 100644
index 546263a..0000000
--- a/include/aidge/quantization_version.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef VERSION_H
-#define VERSION_H
-
-namespace Aidge {
-static constexpr const int PROJECT_VERSION_MAJOR = 0;
-static constexpr const int PROJECT_VERSION_MINOR = 2;
-static constexpr const int PROJECT_VERSION_PATCH = 0;
-static constexpr const char * PROJECT_VERSION = "0.2.0";
-static constexpr const char * PROJECT_GIT_HASH = "f50c860";
-}
-#endif // VERSION_H
--
GitLab