Skip to content

Pharo 11 compatibility #304

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.

Sign up for GitHub

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

Merged
olekscode merged 4 commits into from
Feb 20, 2023
Merged

Pharo 11 compatibility #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b775400
Pharo 11 compatibility
jecisc Feb 20, 2023
76699bc
Merge branch 'master' into Pharo-12-compatibility
jecisc Feb 20, 2023
847f16a
Enable P11 CI
jecisc Feb 20, 2023
86cc9eb
Rename compatibility packages
jecisc Feb 20, 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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Release

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -11,7 +11,7 @@ jobs:
build:
strategy:
matrix:
smalltalk: [ Pharo64-9.0, Pharo64-10 ]
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11 ]
os: [ macos-latest, windows-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smalltalk-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
PROJECT_NAME: PolyMath-${{ matrix.smalltalk }}
strategy:
matrix:
smalltalk: [ Pharo64-9.0, Pharo64-10 ]
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11 ]
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 8 additions & 1 deletion src/BaselineOfPolyMath/BaselineOfPolyMath.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,14 @@ BaselineOfPolyMath >> baseline: spec [
with:
#('Math-Tests-Matrix' 'Math-Tests-Clustering' 'Math-Tests-Numerical' 'Math-Tests-Complex' 'Math-Tests-Quaternion' 'Math-Tests-Random' 'Math-Tests-ODE' 'Math-Tests-KDTree' 'Math-Tests-FunctionFit' 'Math-Tests-AutomaticDifferenciation' 'Math-Tests-FastFourierTransform' 'Math-Tests-Accuracy' 'Math-Tests-ArbitraryPrecisionFloat' 'Math-Tests-KolmogorovSmirnov' 'Math-Tests-Quantile' 'Math-Tests-Polynomials' 'Math-Tests-PrincipalComponentAnalysis' 'Math-Tests-KernelSmoothing' 'Math-Tests-Number-Extensions' 'Math-Tests-Permutation' 'Math-Tests-TSNE' 'Math-Tests-Core-Process' 'Math-Tests-Core-Distribution' 'Math-Tests-Core');
group: 'default'
with: #('Core' 'Extensions' 'Tests' 'Benchmarks' 'Accuracy') ]
with: #('Core' 'Extensions' 'Tests' 'Benchmarks' 'Accuracy') ].

spec for: #( #'pharo6.x' #'pharo7.x' #'pharo8.x' #'pharo9.x' #'pharo10.x' ) do: [
spec
package: 'Math-Numerical' with: [ spec requires: #( 'Math-CompatibilityUpToPharo11' ) ];
package: 'Math-Benchmarks-KDTree' with: [ spec requires: #( 'Math-CompatibilityUpToPharo11' ) ];
package: 'Math-Tests-KDTree' with: [ spec requires: #( 'Math-CompatibilityUpToPharo11' ) ];
package: 'Math-CompatibilityUpToPharo11' ]
]

{ #category : #accessing }
Expand Down
4 changes: 2 additions & 2 deletions src/Math-Benchmarks-KDTree/PMKDTreeBenchmark.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Class {
'collType',
'm'
],
#category : 'Math-Benchmarks-KDTree'
#category : #'Math-Benchmarks-KDTree'
}

{ #category : #defaults }
Expand Down Expand Up @@ -109,7 +109,7 @@ PMKDTreeBenchmark >> collType: aSequencableCollectionClass [
{ #category : #'initialize-release' }
PMKDTreeBenchmark >> initialize [
super initialize.
collType := FloatArray.
collType := Float32Array.
rand := Random new
]

Expand Down
6 changes: 6 additions & 0 deletions src/Math-CompatibilityUpToPharo11/Float32Array.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Class {
#name : #Float32Array,
#superclass : #FloatArray,
#type : #words,
#category : #'Math-CompatibilityUpToPharo11'
}
1 change: 1 addition & 0 deletions src/Math-CompatibilityUpToPharo11/package.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package { #name : #'Math-CompatibilityUpToPharo11' }
4 changes: 2 additions & 2 deletions src/Math-Numerical/PMLineSearch.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ PMLineSearch >> initialize [
failingMin := 1e-3.
useCubicApproximation := false.
" Values for g(0), g'(0) and g(1) "
boundaryValues := FloatArray new: 3.
boundaryValues := Float32Array new: 3.
" Result: x1, g(x1), x2, g(x2) "
extendedResult := FloatArray new: 4.
extendedResult := Float32Array new: 4.
^ self
]

Expand Down
4 changes: 2 additions & 2 deletions src/Math-Tests-KDTree/PMKDTreeTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ PMKDTreeTest >> testIndexedKDTreeSimple [
| r n aTree bTree |
r := rand next: 200.
aTree := PMIndexedKDTree
withAll: (r collect: [ :i | FloatArray with: i with: i ]). "2-dimensional data"
withAll: (r collect: [ :i | Float32Array with: i with: i ]). "2-dimensional data"
bTree := PMIndexedKDTree
withAll: (r collect: [ :i | FloatArray with: i ]). "1-dimensional data"
withAll: (r collect: [ :i | Float32Array with: i ]). "1-dimensional data"
1 to: 20 do: [ :v |
n := 1 / v.
self
Expand Down