From: David Elsing <david.elsing@posteo.net>
To: 72471@debbugs.gnu.org
Cc: David Elsing <david.elsing@posteo.net>
Subject: [bug#72471] [PATCH 24/24] gnu: python-pytorch-lightning: Update to commit 2064887.
Date: Sun, 4 Aug 2024 22:16:02 +0000 [thread overview]
Message-ID: <20240804221635.3805-24-david.elsing@posteo.net> (raw)
In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net>
* gnu/packages/machine-learning.scm (python-pytorch-lightning): Update to
commit 2064887.
[source]: Update URL.
[arguments]<#:tests-flags>: Skip additional failing tests.
<#:phases>: Adjust 'patch-version-detection' phase.
---
gnu/packages/machine-learning.scm | 249 ++++++++++++++++--------------
1 file changed, 130 insertions(+), 119 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 5449e884d5..73bb520ffc 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5157,126 +5157,137 @@ (define-public python-inquirer
(license license:expat)))
(define-public python-pytorch-lightning
- (package
- (name "python-pytorch-lightning")
- (version "2.0.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Lightning-AI/lightning")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1w4lajiql4y5nnhqf6i5wii1mrwnhp5f4bzbwdzb5zz0d0lysb1i"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags
- '(list "-m" "not cloud and not tpu" "tests/tests_pytorch"
- ;; we don't have onnxruntime
- "--ignore=tests/tests_pytorch/models/test_onnx.py"
-
- ;; We don't have tensorboard, so we skip all those tests that
- ;; require it for logging.
- "--ignore=tests/tests_pytorch/checkpointing/test_model_checkpoint.py"
- "--ignore=tests/tests_pytorch/loggers/test_all.py"
- "--ignore=tests/tests_pytorch/loggers/test_logger.py"
- "--ignore=tests/tests_pytorch/loggers/test_tensorboard.py"
- "--ignore=tests/tests_pytorch/models/test_cpu.py"
- "--ignore=tests/tests_pytorch/models/test_hparams.py"
- "--ignore=tests/tests_pytorch/models/test_restore.py"
- "--ignore=tests/tests_pytorch/profilers/test_profiler.py"
- "--ignore=tests/tests_pytorch/trainer/flags/test_fast_dev_run.py"
- "--ignore=tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py"
- "--ignore=tests/tests_pytorch/trainer/logging_/test_train_loop_logging.py"
- "--ignore=tests/tests_pytorch/trainer/properties/test_loggers.py"
- "--ignore=tests/tests_pytorch/trainer/properties/test_log_dir.py"
- "--ignore=tests/tests_pytorch/trainer/test_trainer.py"
-
- ;; This needs internet access
- "--ignore=tests/tests_pytorch/helpers/test_models.py"
- "--ignore=tests/tests_pytorch/helpers/test_datasets.py"
- "--ignore=tests/tests_pytorch/helpers/datasets.py"
-
- ;; We have no legacy checkpoints
- "--ignore=tests/tests_pytorch/checkpointing/test_legacy_checkpoints.py"
-
- ;; TypeError: _FlakyPlugin._make_test_flaky() got an unexpected keyword argument 'reruns'
- "--ignore=tests/tests_pytorch/models/test_amp.py"
- "--ignore=tests/tests_pytorch/profilers/test_profiler.py"
-
- "--ignore=tests/tests_pytorch/graveyard/test_legacy_import_unpickler.py"
-
- "-k"
- (string-append
- ;; We don't have tensorboard
- "not test_property_logger"
- " and not test_cli_logger_shorthand"
- ;; Something wrong with Flaky
- " and not test_servable_module_validator_with_trainer"))
- #:phases
- '(modify-phases %standard-phases
- (add-after 'unpack 'patch-version-detection
- (lambda _
- ;; We do have pytorch 1.13.1, but the version comparison fails.
- (substitute* "src/lightning/fabric/utilities/imports.py"
- (("_TORCH_GREATER_EQUAL_1_13 =.*")
- "_TORCH_GREATER_EQUAL_1_13 = True\n"))))
- (add-before 'build 'pre-build
- (lambda _ (setenv "PACKAGE_NAME" "lightning")))
- (add-after 'install 'pre-build-pytorch
- (lambda _
- ;; pyproject-build-system only tolerates unicycles.
- (for-each delete-file (find-files "dist" "\\.whl"))
- (setenv "PACKAGE_NAME" "pytorch")))
- (add-after 'pre-build-pytorch 'build-pytorch
- (assoc-ref %standard-phases 'build))
- (add-after 'build-pytorch 'install-pytorch
- (assoc-ref %standard-phases 'install))
- (add-before 'check 'pre-check
- (lambda _
- ;; We don't have Tensorboard
- (substitute* "tests/tests_pytorch/test_cli.py"
- ((" TensorBoardLogger\\(\".\"\\)") "")))))))
- (propagated-inputs
- (list python-arrow
- python-beautifulsoup4
- python-croniter
- python-dateutils
- python-deepdiff
- python-fastapi-for-pytorch-lightning
- python-fsspec
- python-inquirer
- python-jsonargparse
- python-lightning-cloud
- python-lightning-utilities
- python-numpy
- python-packaging
- python-pytorch
- python-pyyaml
- python-starsessions-for-pytorch-lightning
- python-torchmetrics
- python-torchvision
- python-tqdm
- python-traitlets
- python-typing-extensions))
- (native-inputs
- (list python-aiohttp
- python-cloudpickle
- python-coverage
- python-flaky
- python-pympler
- python-pytest
- python-psutil
- python-requests-mock
- python-scikit-learn))
- (home-page "https://lightning.ai/")
- (synopsis "Deep learning framework to train, deploy, and ship AI products")
- (description
- "PyTorch Lightning is just organized PyTorch; Lightning disentangles
+ (let ((commit "2064887b12dd934a5f9a2bf45897f29e3bfc74d1")
+ (revision "0"))
+ (package
+ (name "python-pytorch-lightning")
+ (version (git-version "2.3.3" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Lightning-AI/pytorch-lightning")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pfmwgzh21i21i4ixank488615q7j8nkvlxd82kmmam97gsd6krg"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ '(list "-m" "not cloud and not tpu" "tests/tests_pytorch"
+ ;; we don't have onnxruntime
+ "--ignore=tests/tests_pytorch/models/test_onnx.py"
+
+ ;; We don't have tensorboard, so we skip all those tests that
+ ;; require it for logging.
+ "--ignore=tests/tests_pytorch/checkpointing/test_model_checkpoint.py"
+ "--ignore=tests/tests_pytorch/loggers/test_all.py"
+ "--ignore=tests/tests_pytorch/loggers/test_logger.py"
+ "--ignore=tests/tests_pytorch/loggers/test_tensorboard.py"
+ "--ignore=tests/tests_pytorch/loggers/test_wandb.py"
+ "--ignore=tests/tests_pytorch/models/test_cpu.py"
+ "--ignore=tests/tests_pytorch/models/test_hparams.py"
+ "--ignore=tests/tests_pytorch/models/test_restore.py"
+ "--ignore=tests/tests_pytorch/profilers/test_profiler.py"
+ "--ignore=tests/tests_pytorch/test_cli.py"
+ "--ignore=tests/tests_pytorch/trainer/flags/test_fast_dev_run.py"
+ "--ignore=tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py"
+ "--ignore=tests/tests_pytorch/trainer/logging_/test_train_loop_logging.py"
+ "--ignore=tests/tests_pytorch/trainer/properties/test_loggers.py"
+ "--ignore=tests/tests_pytorch/trainer/properties/test_log_dir.py"
+ "--ignore=tests/tests_pytorch/trainer/test_trainer.py"
+
+ ;; This needs internet access
+ "--ignore=tests/tests_pytorch/helpers/test_models.py"
+ "--ignore=tests/tests_pytorch/helpers/test_datasets.py"
+ "--ignore=tests/tests_pytorch/helpers/datasets.py"
+
+ ;; We have no legacy checkpoints
+ "--ignore=tests/tests_pytorch/checkpointing/test_legacy_checkpoints.py"
+
+ ;; TypeError: _FlakyPlugin._make_test_flaky() got an unexpected
+ ;; keyword argument 'reruns'
+ "--ignore=tests/tests_pytorch/models/test_amp.py"
+ "--ignore=tests/tests_pytorch/utilities/test_all_gather_grad.py"
+
+ ;; Requires CUDA
+ "--ignore=tests/tests_pytorch/plugins/precision/test_bitsandbytes.py"
+
+ "-k"
+ (string-append
+ ;; We don't have tensorboard
+ "not test_property_logger"
+ " and not test_cli_logger_shorthand"
+ ;; Wrong module appears in sys.modules
+ " and not test_patch_legacy_imports_unified"
+ ;; Missing log message
+ " and not test_should_stop_early_stopping_conditions_met"
+ " and not test_fit_loop_done_log_messages"
+ ;; Something wrong with Flaky
+ " and not test_servable_module_validator_with_trainer"))
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'patch-version-detection
+ (lambda _
+ ;; We do have pytorch 2.4.0, but the version comparison fails.
+ (substitute* "src/lightning/fabric/utilities/imports.py"
+ (("_TORCH_GREATER_EQUAL_2_4 =.*")
+ "_TORCH_GREATER_EQUAL_2_4 = True\n"))))
+ (add-before 'build 'pre-build
+ (lambda _ (setenv "PACKAGE_NAME" "lightning")))
+ (add-after 'install 'pre-build-pytorch
+ (lambda _
+ ;; pyproject-build-system only tolerates unicycles.
+ (for-each delete-file (find-files "dist" "\\.whl"))
+ (setenv "PACKAGE_NAME" "pytorch")))
+ (add-after 'pre-build-pytorch 'build-pytorch
+ (assoc-ref %standard-phases 'build))
+ (add-after 'build-pytorch 'install-pytorch
+ (assoc-ref %standard-phases 'install))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; We don't have Tensorboard
+ (substitute* "tests/tests_pytorch/test_cli.py"
+ ((" TensorBoardLogger\\(\".\"\\)") "")))))))
+ (propagated-inputs
+ (list python-arrow
+ python-beautifulsoup4
+ python-croniter
+ python-dateutils
+ python-deepdiff
+ python-fastapi-for-pytorch-lightning
+ python-fsspec
+ python-inquirer
+ python-jsonargparse
+ python-lightning-cloud
+ python-lightning-utilities
+ python-numpy
+ python-packaging
+ python-pytorch
+ python-pyyaml
+ python-starsessions-for-pytorch-lightning
+ python-torchmetrics
+ python-torchvision
+ python-tqdm
+ python-traitlets
+ python-typing-extensions))
+ (native-inputs
+ (list python-aiohttp
+ python-cloudpickle
+ python-coverage
+ python-flaky
+ python-pympler
+ python-pytest
+ python-psutil
+ python-requests-mock
+ python-scikit-learn))
+ (home-page "https://lightning.ai/")
+ (synopsis "Deep learning framework to train, deploy, and ship AI products")
+ (description
+ "PyTorch Lightning is just organized PyTorch; Lightning disentangles
PyTorch code to decouple the science from the engineering.")
- (license license:asl2.0)))
+ (license license:asl2.0))))
(define-public python-torchmetrics
(package
--
2.45.1
next prev parent reply other threads:[~2024-08-04 22:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-04 21:53 [bug#72471] [PATCH 00/24] Update PyTorch and dependencies David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 01/24] gnu: asmjit: Update to commit 062e69c David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 02/24] gnu: Remove python-typing-extensions-4.10 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 03/24] gnu: python-optree: Update to 0.11.0 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 04/24] gnu: flatbuffers-next: Update to 24.3.25 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 05/24] gnu: pthreadpool: Update to commit 560c60d David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 06/24] gnu: cpuinfo: Update to commit 05332fd David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 07/24] gnu: nnpack: Depend on python-peachpy only for x86_64 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 08/24] gnu: oneapi-dnnl: Update to 3.5.3 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 09/24] gnu: fbgemm: Update to 0.7.0 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 10/24] gnu: xnnpack: Update to commit 08f1489 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 11/24] gnu: Add xnnpack-for-r-torch David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 12/24] gnu: python-nbval: Update to 0.11.0 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 13/24] gnu: Add python-parameterized-next David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 14/24] gnu: Remove onnx-optimizer-for-torch2 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 15/24] gnu: Remove onnx-for-torch2 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 16/24] gnu: onnx: Update to 1.16.2 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 17/24] gnu: onnx-optimizer: Update to 0.3.19 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 18/24] gnu: gloo: Update to commit 81925d1 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 19/24] gnu: cpp-httplib: Update to 0.16.0 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 20/24] gnu: python-pytorch: Update to 2.4.0 David Elsing
2024-08-04 22:15 ` [bug#72471] [PATCH 21/24] gnu: python-torchvision: Update to 0.19.0 David Elsing
2024-08-04 22:16 ` [bug#72471] [PATCH 22/24] gnu: python-lightning-utilities: Update to 0.11.6 David Elsing
2024-08-04 22:16 ` [bug#72471] [PATCH 23/24] gnu: python-torchmetrics: Update to 1.4.1 David Elsing
2024-08-04 22:16 ` David Elsing [this message]
2024-09-06 9:54 ` bug#72471: [PATCH 00/24] Update PyTorch and dependencies Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240804221635.3805-24-david.elsing@posteo.net \
--to=david.elsing@posteo.net \
--cc=72471@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).