mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
7b62d614e7
Autogenerated files are also regenerated. The tests can be run, but are disabled, as they require a long time. * gnu/packages/machine-learning.scm (python-pytorch): Update to 2.2.1. [version]: Use %python-pytorch-version. [source]: Use %python-pytorch-src. [arguments]: Remove 'make-things-writable phase. Add 'cmake-patches, 'disable-avx-dependencies, 'set-max-jobs, 'codegen1, 'codegen2, 'build2, 'install2 phases. Adjust 'use-system-libraries and 'check phases. [native-inputs]: Add doxygen, ideep-pytorch, pocketfft-cpp, python-expecttest, python-pytest-flakefinder, python-pytest-rerunfailures-13, python-pytest-shard, python-pytest-xdist, python-hypothesis, python-types-dataclasses, python-typing-extensions-4.10 and valgrind. [inputs]: Add asmjit, clog, flatbuffers-next, foxi, fxdiv, libuv, miniz-for-pytorch, qnnpack, qnnpack-pytorch and oneapi-dnnl. Use nnpack, oneapi-dnnl, qnnpack, qnnpack-pytorch and xnnpack only for supported systems. [propagated-inputs]: Add python-filelock, python-fsspec, python-jinja2, python-networkx, python-opt-einsum, python-optree, python-packaging, python-psutil and python-sympy. Remove python-cffi and python-six. Use cpuinfo only for supported systems. (%python-pytorch-src)[source]: Add patches. (python-pytorch2): Remove variable. * gnu/packages/patches/python-pytorch-runpath.patch: Adjust patch. * gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust patch. * gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch: Remove file. * gnu/packages/patches/python-pytorch-fix-codegen.patch: New file. * gnu/packages/patches/python-pytorch-without-kineto: New file. * gnu/local.mk (dist_patch_DATA): Register them.
60 lines
2 KiB
Diff
60 lines
2 KiB
Diff
Even when building without Kineto, the <ActivityType.h> header is still
|
|
imported and the ActivityType type is used. This patch was copied from
|
|
https://github.com/pytorch/pytorch/pull/111048.
|
|
|
|
diff --git a/torch/csrc/profiler/kineto_shim.h b/torch/csrc/profiler/kineto_shim.h
|
|
index e92cbf00..68985ab7 100644
|
|
--- a/torch/csrc/profiler/kineto_shim.h
|
|
+++ b/torch/csrc/profiler/kineto_shim.h
|
|
@@ -12,7 +12,51 @@
|
|
#undef USE_KINETO
|
|
#endif
|
|
|
|
+#ifdef USE_KINETO
|
|
#include <ActivityType.h>
|
|
+#else
|
|
+namespace libkineto {
|
|
+// copied from header
|
|
+/*
|
|
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
+ * All rights reserved.
|
|
+ *
|
|
+ * This source code is licensed under the BSD-style license found in the
|
|
+ * LICENSE file in the root directory of this source tree.
|
|
+ */
|
|
+
|
|
+// Note : All activity types are not enabled by default. Please add them
|
|
+// at correct position in the enum
|
|
+enum class ActivityType {
|
|
+ // Activity types enabled by default
|
|
+ CPU_OP = 0, // cpu side ops
|
|
+ USER_ANNOTATION,
|
|
+ GPU_USER_ANNOTATION,
|
|
+ GPU_MEMCPY,
|
|
+ GPU_MEMSET,
|
|
+ CONCURRENT_KERNEL, // on-device kernels
|
|
+ EXTERNAL_CORRELATION,
|
|
+ CUDA_RUNTIME, // host side cuda runtime events
|
|
+ CUDA_DRIVER, // host side cuda driver events
|
|
+ CPU_INSTANT_EVENT, // host side point-like events
|
|
+ PYTHON_FUNCTION,
|
|
+ OVERHEAD, // CUPTI induced overhead events sampled from its overhead API.
|
|
+
|
|
+ // Optional Activity types
|
|
+ CUDA_SYNC, // synchronization events between runtime and kernels
|
|
+ GLOW_RUNTIME, // host side glow runtime events
|
|
+ MTIA_RUNTIME, // host side MTIA runtime events
|
|
+ CUDA_PROFILER_RANGE, // CUPTI Profiler range for performance metrics
|
|
+ MTIA_CCP_EVENTS, // MTIA ondevice CCP events
|
|
+ HPU_OP, // HPU host side runtime event
|
|
+ XPU_RUNTIME, // host side xpu runtime events
|
|
+
|
|
+ ENUM_COUNT, // This is to add buffer and not used for any profiling logic. Add your new type before it.
|
|
+ OPTIONAL_ACTIVITY_TYPE_START = CUDA_SYNC,
|
|
+};
|
|
+}
|
|
+
|
|
+#endif
|
|
|
|
#include <torch/csrc/Export.h>
|
|
#include <torch/csrc/profiler/api.h>
|