Skip to content

Commit

Permalink
init version 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jurgen-lentz committed Feb 27, 2024
1 parent 9d8d804 commit a8bd9cc
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 305 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-scipoptsuite-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
version:
description: "SCIPOptSuite version to install"
required: true
default: "8.1.0"
default: "9.0.0"

runs:
using: "composite"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
### Changed
### Removed

## v0.5.0
### Added

## v0.3.1
### Update
* support cython 3.0.0
Expand Down
279 changes: 0 additions & 279 deletions output.txt

This file was deleted.

2 changes: 1 addition & 1 deletion src/pygcgopt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.3.1'
__version__ = '0.5.0'

# required for Python 3.8 on Windows
import os
Expand Down
4 changes: 2 additions & 2 deletions src/pygcgopt/consclassifier.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ cdef class ConsClassifier:
def classify(self, conss, partition):
pass

cdef SCIP_RETCODE PyConsClassifierFree(SCIP* scip, GCG_CONSCLASSIFIER* consclassifier) with gil:
cdef SCIP_RETCODE PyConsClassifierFree(SCIP* scip, GCG_CONSCLASSIFIER* consclassifier) noexcept with gil:
cdef GCG_CLASSIFIERDATA* consclassifierdata
consclassifierdata = GCGconsClassifierGetData(consclassifier)
py_consclassifier = <ConsClassifier>consclassifierdata
py_consclassifier.freeConsClassifier()
Py_DECREF(py_consclassifier)
return SCIP_OKAY

cdef SCIP_RETCODE PyConsClassifierClassify(SCIP* scip, GCG_CONSCLASSIFIER* consclassifier, SCIP_Bool transformed) with gil:
cdef SCIP_RETCODE PyConsClassifierClassify(SCIP* scip, GCG_CONSCLASSIFIER* consclassifier, SCIP_Bool transformed) noexcept with gil:
cdef GCG_CLASSIFIERDATA* consclassifierdata
consclassifierdata = GCGconsClassifierGetData(consclassifier)
py_consclassifier = <ConsClassifier>consclassifierdata
Expand Down
18 changes: 9 additions & 9 deletions src/pygcgopt/detector.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,23 @@ cdef wrap_detector_callback_result(Detector detector, PARTIALDEC_DETECTION_DATA*
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])


cdef SCIP_RETCODE PyDetectorFree (SCIP* scip, GCG_DETECTOR* detector) with gil:
cdef SCIP_RETCODE PyDetectorFree (SCIP* scip, GCG_DETECTOR* detector) noexcept with gil:
py_detector = get_py_detector(detector)
py_detector.freeDetector()
Py_DECREF(py_detector)
return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorInit (SCIP* scip, GCG_DETECTOR* detector) with gil:
cdef SCIP_RETCODE PyDetectorInit (SCIP* scip, GCG_DETECTOR* detector) noexcept with gil:
py_detector = get_py_detector(detector)
py_detector.initDetector()
return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorExit (SCIP* scip, GCG_DETECTOR* detector) with gil:
cdef SCIP_RETCODE PyDetectorExit (SCIP* scip, GCG_DETECTOR* detector) noexcept with gil:
py_detector = get_py_detector(detector)
py_detector.exitDetector()
return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorPropagatePartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorPropagatePartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) noexcept with gil:
cdef SCIP_CLOCK* clock = start_new_clock(scip)

py_detector = get_py_detector(detector)
Expand All @@ -104,7 +104,7 @@ cdef SCIP_RETCODE PyDetectorPropagatePartialdec (SCIP* scip, GCG_DETECTOR* detec

return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorFinishPartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorFinishPartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) noexcept with gil:
cdef SCIP_CLOCK* clock = start_new_clock(scip)

py_detector = get_py_detector(detector)
Expand All @@ -117,7 +117,7 @@ cdef SCIP_RETCODE PyDetectorFinishPartialdec (SCIP* scip, GCG_DETECTOR* detector

return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorPostprocessPartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorPostprocessPartialdec (SCIP* scip, GCG_DETECTOR* detector, PARTIALDEC_DETECTION_DATA* partialdecdetectiondata, SCIP_RESULT* result) noexcept with gil:
cdef SCIP_CLOCK* clock = start_new_clock(scip)

py_detector = get_py_detector(detector)
Expand All @@ -130,19 +130,19 @@ cdef SCIP_RETCODE PyDetectorPostprocessPartialdec (SCIP* scip, GCG_DETECTOR* det

return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorSetParamAggressive (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorSetParamAggressive (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) noexcept with gil:
py_detector = get_py_detector(detector)
result_dict = py_detector.setParamAggressive() or {}
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorSetParamDefault (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorSetParamDefault (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) noexcept with gil:
py_detector = get_py_detector(detector)
result_dict = py_detector.setParamDefault() or {}
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
return SCIP_OKAY

cdef SCIP_RETCODE PyDetectorSetParamFast (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) with gil:
cdef SCIP_RETCODE PyDetectorSetParamFast (SCIP* scip, GCG_DETECTOR* detector, SCIP_RESULT* result) noexcept with gil:
py_detector = get_py_detector(detector)
result_dict = py_detector.setParamFast() or {}
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
Expand Down
Loading

0 comments on commit a8bd9cc

Please sign in to comment.