Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add callback function for logging #20

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f4e6b81
ajout source PNE de metrix
ErDumont Feb 26, 2020
6051ac5
remove standalone PNE binary
ErDumont Feb 26, 2020
b04aebf
remove standalone SPX binary
ErDumont Feb 26, 2020
1f8fcaf
remove standalone PNE file form cmakelist
ErDumont Feb 26, 2020
b8b04b1
move mains
ErDumont Feb 26, 2020
348339e
Ajouts exports pour find_package
ErDumont Mar 10, 2020
780d217
maj gitignore
ErDumont Mar 10, 2020
363babe
Retrieved Sirius version from Antares VCPK branch
ErDumont Jul 2, 2020
2c1d3e8
Fix for centOS build
ErDumont Jul 10, 2020
63e28c6
add public header to install include directory
Aug 3, 2020
1a98a4f
Merge remote-tracking branch 'origin/unification_2020' into metrix
ed-mpichon Oct 20, 2020
e597aaa
[sources] Remove build files located in sources tree.
ed-mpichon Oct 20, 2020
0d3668e
[cmake] Add a top level CMakeLists.txt out of src directory.
ed-mpichon Oct 20, 2020
c9ba458
[cmake] install: Fix installation of public headers.
ed-mpichon Oct 20, 2020
9185603
[cmake] Add install interface generator expression for include direct…
ed-mpichon Oct 23, 2020
e6766bf
[SRS] Uncomment code in computeColBoundType
ed-mpichon Oct 30, 2020
dd5ec85
[SRS] Add API methods to transfer variable's bounds type and values t…
ed-mpichon Oct 30, 2020
3a673f4
[SRS] Fix missing return type
ed-mpichon Nov 9, 2020
0cdde63
[SRS] Update API method to transfer variable's value
ed-mpichon Nov 10, 2020
c886e10
[SRS] Fix function SRSgetcolbasisstatus, use probleme_simplexe to ret…
ed-mpichon Dec 2, 2020
9aef469
[SRS] Fix null check in SRSgetrowbasisstatus
ed-mpichon Dec 2, 2020
fa1b217
Merge only directory src/SRS of remote-tracking branch 'origin/metrix…
ed-mpichon Dec 10, 2020
59e81be
Merge pull request #1 from AntaresSimulatorTeam/Antares_VCPKG
klorel Dec 11, 2020
42f1b65
Feature/add actions (#6)
sgatto Apr 7, 2022
f94b2b0
correct Feature/add actions (#7)
sgatto Apr 7, 2022
5766a88
[SRS] Implement SRSsetobjoffset
flomnes May 20, 2022
a690aac
windows-2019 -> windows-2022
flomnes May 23, 2022
4253b07
Add getter for objective offset
flomnes Jul 11, 2022
e9a8c26
Fix return type for SRSgetobjoffset
flomnes Jul 11, 2022
e6edda6
Merge pull request #10 from rte-france/feature/SRSsetobjoffset
flomnes Nov 8, 2022
64f20d8
Restore function 'PNE_EcrireJeuDeDonneesMPS_avecNom' (#5)
flomnes Nov 16, 2022
a0d2fd1
[SRS] Do not use fixed variables, even if LB==UB (#15)
flomnes Dec 19, 2022
c9da3e5
Initial commit
flomnes Jun 1, 2023
38a0f5e
Apply dos2unix
flomnes Jun 1, 2023
c59e151
Trailing whitespaces
flomnes Jun 1, 2023
6f713be
Revert encoding glitch
flomnes Jun 1, 2023
7db365d
Remove more encoding glitches
flomnes Jun 1, 2023
fb4167d
Remove malloc/free
flomnes Jun 1, 2023
be80338
Apply dos2unix
flomnes Jun 1, 2023
4a0a6cc
less if/else
a-zakir Jun 2, 2023
6761723
Merge branch 'feature/constraint-name' of https://github.com/rte-fran…
a-zakir Jun 2, 2023
38502d1
delete unused include
a-zakir Jun 2, 2023
797b83a
Update src/PNE/pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 5, 2023
2aa1bbe
Update pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 5, 2023
042d4c4
Update pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 5, 2023
33b4375
Update pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 6, 2023
b018808
Update pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 6, 2023
dd1bed0
Update pne_ecrire_jeu_de_donnees_mps.c
a-zakir Jun 6, 2023
8aedd9b
Update pne_definition_arguments.h
a-zakir Jun 6, 2023
63f2678
Merge pull request #16 from rte-france/feature/constraint-name
a-zakir Jun 6, 2023
b67eeb5
Fix encoding & missing spaces (#17)
flomnes Jun 6, 2023
2d702ae
start
a-zakir Nov 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions .github/workflows/centos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: CentOS

on:
push:
branches:
- main
- feature/*
- antares_integration
- fix/*
release:
types: [ created ]

env:
GITHUB_TOKEN: ${{ github.token }}

jobs:

build_sirius:
name: build sirius
runs-on: ubuntu-latest
container: 'centos:centos7'
env:
Sirius_Ref: antares_integration
steps:
- name: is release created
run: |
release_created=${{ github.event_name == 'release' && github.event.action == 'created' }}
echo "RELEASE_CREATED=$release_created" >> $GITHUB_ENV

- name: Get release
if: ${{ env.RELEASE_CREATED == 'true' }}
id: get_release
uses:
bruceadams/[email protected]

- name: install requirements
run: |
yum install -y epel-release
yum install -y git redhat-lsb-core centos-release-scl scl-utils
yum install -y cmake3 devtoolset-9

- name: Checkout sirius
run: |
git clone https://github.com/rte-france/sirius-solver -b ${{ env.Sirius_Ref }} .

- name: set sirius output variables
id: sirius-variables
run: |
SIRIUS_BASE_PATH=$PWD
SIRIUS_INSTALL_DIR=centos-7_sirius-solver-install
SIRIUS_INSTALL_PATH="${SIRIUS_BASE_PATH}/${SIRIUS_INSTALL_DIR}"
ARCHIVE_NAME=centos-7_sirius-solver.zip
ARCHIVE_PATH="${SIRIUS_BASE_PATH}/${ARCHIVE_NAME}"
echo "::set-output name=install-dir::$SIRIUS_INSTALL_DIR"
echo "::set-output name=install-path::$SIRIUS_INSTALL_PATH"
echo "::set-output name=archive-name::$ARCHIVE_NAME"
echo "::set-output name=archive-path::$ARCHIVE_PATH"

- name: Configure Sirius
run: |
source /opt/rh/devtoolset-9/enable
cmake3 -S src \
-B build \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${{ steps.sirius-variables.outputs.install-dir }}"

- name: Build & Install Sirius
run: |
source /opt/rh/devtoolset-9/enable
cmake3 --build build --config Release --target install -j14

- name: Zip Install Sirius
run: |
ARCHIVE_NAME="${{ steps.sirius-variables.outputs.archive-name }}"
zip -r $ARCHIVE_NAME "${{ steps.sirius-variables.outputs.install-dir }}"

- name: Upload sirius install
uses: actions/upload-artifact@v2
with:
name: ${{ steps.sirius-variables.outputs.install-dir }}
path: ${{ steps.sirius-variables.outputs.install-path }}

- name: Publish sirius install
if: ${{ env.RELEASE_CREATED == 'true' }}
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ${{ steps.sirius-variables.outputs.archive-path }}
asset_name: ${{ steps.sirius-variables.outputs.archive-name }}
asset_content_type: application/zip
93 changes: 93 additions & 0 deletions .github/workflows/ubuntu-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Windows-Ubuntu

on:
push:
branches:
- main
- feature/*
- antares_integration
- fix/*
release:
types: [ created ]

env:
GITHUB_TOKEN: ${{ github.token }}

jobs:

build_sirius:
name: ${{ matrix.os }} build sirius
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-20.04]
steps:
- name: is release created
shell: bash
run: |
release_created=${{ github.event_name == 'release' && github.event.action == 'created' }}
echo "RELEASE_CREATED=$release_created" >> $GITHUB_ENV

- name: Get release
if: ${{ env.RELEASE_CREATED == 'true' }}
id: get_release
uses:
bruceadams/[email protected]

- name: install zip for windows
if: ${{ startsWith(matrix.os, 'windows') }}
shell: cmd
run: |
choco install zip --no-progress

- name: Checkout
uses: actions/checkout@v2

- name: set sirius output variables
id: sirius-variables
shell: bash
run: |
SIRIUS_BASE_PATH="${{ github.workspace }}"
SIRIUS_INSTALL_DIR="${{ matrix.os }}_sirius-solver-install"
SIRIUS_INSTALL_PATH="${SIRIUS_BASE_PATH}/${SIRIUS_INSTALL_DIR}"
ARCHIVE_NAME="${{ matrix.os }}_sirius-solver.zip"
ARCHIVE_PATH="${SIRIUS_BASE_PATH}/${ARCHIVE_NAME}"
echo "::set-output name=install-dir::$SIRIUS_INSTALL_DIR"
echo "::set-output name=install-path::$SIRIUS_INSTALL_PATH"
echo "::set-output name=archive-name::$ARCHIVE_NAME"
echo "::set-output name=archive-path::$ARCHIVE_PATH"

- name: Configure Sirius
shell: bash
run: |
cmake -S src \
-B build \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${{ steps.sirius-variables.outputs.install-dir }}"

- name: Build & Install Sirius
shell: bash
run: |
cmake --build build --config Release --target install -j14

- name: Zip Install Sirius
shell: bash
run: |
zip -r "${{ steps.sirius-variables.outputs.archive-name }}" "${{ steps.sirius-variables.outputs.install-dir }}"

- name: Upload sirius install
uses: actions/upload-artifact@v2
with:
name: ${{ steps.sirius-variables.outputs.install-dir }}
path: ${{ steps.sirius-variables.outputs.install-path }}

- name: Publish sirius install
if: ${{ env.RELEASE_CREATED == 'true' }}
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ${{ steps.sirius-variables.outputs.archive-path }}
asset_name: ${{ steps.sirius-variables.outputs.archive-name }}
asset_content_type: application/zip

29 changes: 0 additions & 29 deletions src/.gitignore

This file was deleted.

111 changes: 0 additions & 111 deletions src/ALLOCATEUR/mem_alloc_super_tableau.c

This file was deleted.

Loading
Loading