From patchwork Sun Aug 4 22:16:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66736 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7470827BBE9; Sun, 4 Aug 2024 23:18:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3736F27BBE2 for ; Sun, 4 Aug 2024 23:18:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007gu-Ni; Sun, 04 Aug 2024 18:17:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sajY1-0007dh-FM for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sajXz-0000tq-6t for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iKPNr7LgFup0w32VEZ+6D5OcTF7dFI6Tpr2T07rh7Y0=; b=koIcyyqOEyd29oDChZzTtqsFgzvdhVe6168b8BQR7BnpgwOkCjFxTzPnnmhm/ki70rakVzmA405AKaONDvR8BnrKEROJ8Cch2ogdFtxF7tgobAUtDUY2DHq4L3PCqcLK97BUGpBABnKIz9/EmBQDgshrbMe7PYeYe7LJE9rp9oBrc/0miNIYWmcrWsjXzXP1WCvgYQrhJuoxnPjGcVXhZNInb8vFOIV64BSVerAT9hJnlOuzaWrhbs8pKDPoM32pYS19K7fP8rkmhvY9bV8jan+xxupLMv6KYrkWp0L18GFNcMwZi8hOUBwQufpLSs7dtyZ4REu57Q1Pzvz+6DR3NA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYK-0004Un-NG for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 24/24] gnu: python-pytorch-lightning: Update to commit 2064887. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987617064 (code B ref 72471); Sun, 04 Aug 2024 22:18:12 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:56 +0000 Received: from localhost ([127.0.0.1]:57529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY3-0004R0-FX for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXg-0004Lz-0O for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C976B240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809824; bh=Zhy5denNuJLcyOQ+blmcbYL2Dk4+YLsRn3gXvBj2awM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=JXSFdvf5SX3+q0aRwzpKoYVdaFp2gVyJ/qn/IHpRuVT8i+ENyVM58vWUApVq+izuk MoPzoDvwRbp1bFJhmZ8uqWAAeL3dWwz+iPe/5R7TzDeQWw8ubB8GdAU1jUQVRqPcFT Db/fxcj93Vdt4zzxZBsfABmeKo4wT6b67UErmp/FwAuJ+1BdAVRn8hjgHC0InerKnN YyNK2M2LZgw/XcDvwJk7iMjMNEfaBmmrjk2YJ0QO2yNNo18pF7e+6PHZCLUJPGifgb D9AhLQ7L7FCaPY7WpsFuSbTI6B1eIbh0UlDTWBGoSXb/UqFxBeERt1pWOpqz8RLDBN xbagwW9lbPbNA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp83S3tz6tlh; Mon, 5 Aug 2024 00:17:04 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:16:02 +0000 Message-ID: <20240804221635.3805-24-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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