[Git][haskell-team/DHG_packages][master] futhark: Upgrading from 0.25.23 to 0.25.26
Kari Pahula (@kaol)
gitlab at salsa.debian.org
Sun Feb 2 18:47:32 GMT 2025
Kari Pahula pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
4feb0422 by Kari Pahula at 2025-02-02T20:45:39+02:00
futhark: Upgrading from 0.25.23 to 0.25.26
- - - - -
8 changed files:
- p/haskell-futhark/debian/changelog
- p/haskell-futhark/debian/patches/disable-lsp
- p/haskell-futhark/debian/patches/lts-zlib
- p/haskell-futhark/debian/patches/series
- − p/haskell-futhark/debian/patches/test-server-timeout
- p/haskell-futhark/debian/tests/control
- p/haskell-futhark/debian/tests/multicore
- p/haskell-futhark/debian/tests/opencl
Changes:
=====================================
p/haskell-futhark/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-futhark (0.25.26-1) unstable; urgency=medium
+
+ * New upstream package
+ * Set tests as flaky for now
+
+ -- Kari Pahula <kaol at debian.org> Sun, 02 Feb 2025 20:34:44 +0200
+
haskell-futhark (0.25.23-2) unstable; urgency=medium
* Add build-essential as dependency for autopkgtest tests
=====================================
p/haskell-futhark/debian/patches/disable-lsp
=====================================
@@ -1,14 +1,14 @@
--- a/src/Futhark/CLI/Main.hs
+++ b/src/Futhark/CLI/Main.hs
-@@ -18,7 +18,6 @@
- import Futhark.CLI.Doc qualified as Doc
+@@ -19,7 +19,6 @@
import Futhark.CLI.Eval qualified as Eval
+ import Futhark.CLI.Fmt qualified as Fmt
import Futhark.CLI.HIP qualified as HIP
-import Futhark.CLI.LSP qualified as LSP
import Futhark.CLI.Literate qualified as Literate
import Futhark.CLI.Misc qualified as Misc
import Futhark.CLI.Multicore qualified as Multicore
-@@ -81,7 +80,6 @@
+@@ -82,7 +81,6 @@
("query", (Query.main, "Query semantic information about program.")),
("literate", (Literate.main, "Process a literate Futhark program.")),
("script", (Script.main, "Run FutharkScript expressions.")),
@@ -18,15 +18,15 @@
("benchcmp", (Benchcmp.main, "Compare two benchmark results.")),
--- a/futhark.cabal
+++ b/futhark.cabal
-@@ -158,7 +158,6 @@
- Futhark.CLI.Eval
+@@ -159,7 +159,6 @@
+ Futhark.CLI.Fmt
Futhark.CLI.HIP
Futhark.CLI.Literate
- Futhark.CLI.LSP
Futhark.CLI.Main
Futhark.CLI.Misc
Futhark.CLI.Multicore
-@@ -299,12 +298,6 @@
+@@ -302,12 +301,6 @@
Futhark.Internalise.Monomorphise
Futhark.Internalise.ReplaceRecords
Futhark.Internalise.TypesValues
@@ -39,7 +39,7 @@
Futhark.MonadFreshNames
Futhark.Optimise.BlkRegTiling
Futhark.Optimise.CSE
-@@ -447,10 +440,8 @@
+@@ -451,10 +444,8 @@
, bytestring >=0.11.2
, bytestring-to-vector >=0.3.0.1
, bmp >=1.2.6.3
@@ -50,7 +50,7 @@
, directory >=1.3.0.0
, directory-tree >=0.12.1
, dlist >=0.6.0.1
-@@ -467,8 +458,6 @@
+@@ -471,8 +462,6 @@
, haskeline
, language-c-quote >= 0.12
, lens
=====================================
p/haskell-futhark/debian/patches/lts-zlib
=====================================
@@ -1,6 +1,6 @@
--- a/futhark.cabal
+++ b/futhark.cabal
-@@ -476,7 +476,7 @@
+@@ -480,7 +480,7 @@
, transformers >=0.3
, vector >=0.12
, versions >=6.0.0
=====================================
p/haskell-futhark/debian/patches/series
=====================================
@@ -1,4 +1,3 @@
disable-lsp
lts-zlib
hiprtc
-test-server-timeout
=====================================
p/haskell-futhark/debian/patches/test-server-timeout deleted
=====================================
@@ -1,45 +0,0 @@
---- a/src/Futhark/CLI/Test.hs
-+++ b/src/Futhark/CLI/Test.hs
-@@ -5,6 +5,7 @@
-
- import Control.Applicative.Lift (Errors, Lift (..), failure, runErrors)
- import Control.Concurrent
-+import Control.Concurrent.Async
- import Control.Exception
- import Control.Monad
- import Control.Monad.Except (ExceptT (..), MonadError, runExceptT, withExceptT)
-@@ -105,7 +106,14 @@
- context prog_ctx $
- pureTestResults $
- liftIO $
-- withServer (futharkServerCfg to_run to_run_args) f
-+ withServer (futharkServerCfg to_run to_run_args) $ \server ->
-+ race (threadDelay $ 5 * 60 * 1000000) (f server) >>= \case
-+ Left _ -> do
-+ abortServer server
-+ -- This value won't be used since abortServer will
-+ -- already cause a non-zero status for wait.
-+ pure undefined
-+ Right r -> pure r
-
- data TestMode
- = -- | Only type check.
---- a/futhark.cabal
-+++ b/futhark.cabal
-@@ -433,6 +433,7 @@
- aeson >=2.0.0.0
- , ansi-terminal >=0.6.3.1
- , array >=0.4
-+ , async >=2.2
- , base >=4.15 && <5
- , base16-bytestring
- , binary >=0.8.3
-@@ -451,7 +452,7 @@
- , filepath >=1.4.1.1
- , free >=5.1.10
- , futhark-data >= 1.1.1.0
-- , futhark-server >= 1.2.2.1
-+ , futhark-server >= 1.2.3.0
- , futhark-manifest >= 1.5.0.0
- , githash >=0.1.6.1
- , half >= 0.3
=====================================
p/haskell-futhark/debian/tests/control
=====================================
@@ -1,10 +1,12 @@
Tests: multicore
Depends: build-essential, futhark
+Restrictions: flaky
Tests: opencl
Depends: build-essential, futhark, pocl-opencl-icd, ocl-icd-opencl-dev
+Restrictions: flaky
Tests: hip
Depends: build-essential, futhark, hipcc, rocminfo
-Restrictions: skippable, needs-sudo
+Restrictions: skippable, needs-sudo, flaky
Architecture: amd64 arm64 ppc64el
=====================================
p/haskell-futhark/debian/tests/multicore
=====================================
@@ -1,4 +1,4 @@
#! /bin/sh
cp -r tests $AUTOPKGTEST_TMP
-futhark test --backend=multicore --notty $AUTOPKGTEST_TMP/tests
+futhark test --backend=multicore --no-tuning --notty $AUTOPKGTEST_TMP/tests
=====================================
p/haskell-futhark/debian/tests/opencl
=====================================
@@ -1,4 +1,4 @@
#! /bin/sh
cp -r tests $AUTOPKGTEST_TMP
-futhark test --backend=opencl --notty $AUTOPKGTEST_TMP/tests
+futhark test --backend=opencl --notty --no-tuning $AUTOPKGTEST_TMP/tests
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/4feb0422f4e966638b251981644985f99acecb17
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/4feb0422f4e966638b251981644985f99acecb17
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20250202/c2b43e61/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list