mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-20 21:14:14 +08:00
TL;DR: Moving to ScalarType in user extensions and removing deprecated dtypes. This change _modifies_ the from/to behavior between ScalarType and StableValue! Whereas before, user extensions could only in abstract pass around obfuscated dtypes appearing as int32_ts, now, users can confidently use torch::headeronly::ScalarType in their extensions for major scalar types. This PR enables ABI stability by adding a translation layer through the shim, so that even if the ScalarType enum values change in the future, user extensions need not fear. Then we add a Tensor scalar_type API which reuses the from/to logic to return to the user a nice ScalarType (vs an abstracted int32_t). I then changed the test to test the scalar_type API. This code change required some refactoring because of circular dependencies. ## BC Breaking note This commit is (narrowly) BC-breaking for unpopular dtypes: `quint*`s, `qint*`s, `Bits*`, `dummy_uint*`s, `dummy_int*`s, `Float8_e8m0fnu`, and `Float4_e2m1fn_x2` in the narrow use case where an extension retrieves a Tensor dtype of the above and passes it into `aoti_torch_call_dispatcher`. As of now, I believe there are 0 users of this use case, so the benefits of this change significantly justify BC-breaking this API. Pull Request resolved: https://github.com/pytorch/pytorch/pull/160557 Approved by: https://github.com/mikaylagawarecki, https://github.com/malfet
171 lines
6.9 KiB
C++
171 lines
6.9 KiB
C++
#pragma once
|
|
// this file can only have stable stuff! Akin to shim.h
|
|
// but unlike shim.h, this file can contain header-only C++
|
|
// code for better UX.
|
|
|
|
#include <torch/csrc/inductor/aoti_torch/c/shim.h>
|
|
|
|
// Technically, this file doesn't use anything from stableivalue_conversions.h,
|
|
// but we need to include it here as the contents of stableivalue_conversions.h
|
|
// used to live here and so we need to expose them for backwards compatibility.
|
|
#include <torch/csrc/stable/stableivalue_conversions.h>
|
|
|
|
// use anonymous namespace to avoid collisions between differing
|
|
// versions of this file that may be included by different sources
|
|
namespace {
|
|
|
|
class StableLibrary final {
|
|
private:
|
|
TorchLibraryHandle lib_;
|
|
|
|
public:
|
|
enum class Kind {
|
|
DEF,
|
|
IMPL,
|
|
FRAGMENT,
|
|
};
|
|
|
|
// constructor
|
|
/// \private
|
|
///
|
|
/// Use STABLE_TORCH_LIBRARY or STABLE_TORCH_LIBRARY_IMPL() instead of using
|
|
/// these constructors directly
|
|
StableLibrary(
|
|
Kind kind,
|
|
const char* ns,
|
|
const char* k,
|
|
const char* file,
|
|
uint32_t line) {
|
|
if (kind == Kind::IMPL) {
|
|
aoti_torch_library_init_impl(ns, k, file, line, &lib_);
|
|
} else if (kind == Kind::DEF) {
|
|
aoti_torch_library_init_def(ns, file, line, &lib_);
|
|
} else { // kind == FRAGMENT
|
|
aoti_torch_library_init_fragment(ns, file, line, &lib_);
|
|
}
|
|
}
|
|
|
|
// do not permit copy
|
|
StableLibrary(const StableLibrary&) = delete;
|
|
StableLibrary& operator=(const StableLibrary&) = delete;
|
|
|
|
// do not permit move
|
|
StableLibrary(StableLibrary&& other) = delete;
|
|
StableLibrary& operator=(StableLibrary&& other) = delete;
|
|
|
|
~StableLibrary() {
|
|
aoti_torch_delete_library_object(lib_);
|
|
}
|
|
|
|
// corresponds to a limited, stable version of torch::library::impl()
|
|
// Inputs:
|
|
// name: the name of the function to implement
|
|
// fn: a boxed function with schema
|
|
// (StableIValue* stack, uint64_t num_inputs, uint64_t num_outputs) ->
|
|
// void
|
|
// fn should follow the calling convention of our boxed kernels that convert
|
|
// to IValues. fn will be called with a StableIValue* array of length
|
|
// max(num_inputs, num_outputs), where the first num_inputs entries are
|
|
// populated with inputs. fn is responsible for stealing the memory of the
|
|
// inputs, in effect "popping" them off the stack, and then populating the
|
|
// stack with StableIValue outputs. Concretely, fn should:
|
|
// 1. read StableIValue inputs from the given stack
|
|
// 2. convert the inputs to the proper types
|
|
// 3. call the function corresponding to name with the inputs
|
|
// 4. convert the outputs to StableIValues
|
|
// 5. populate the now empty stack with StableIValue outputs
|
|
// If the operation corresponding to name takes in 4 inputs and returns 2
|
|
// outputs, fn should expect stack to contain 4 StableIValues:
|
|
// [stable_arg1, stable_arg2, stable_arg3, stable_arg4]
|
|
// to end, fn should fill the stack with 2 StableIValues representing outputs:
|
|
// [stable_ret1, stable_ret2, -, -]
|
|
StableLibrary& impl(
|
|
const char* name,
|
|
void (*fn)(StableIValue*, uint64_t, uint64_t)) {
|
|
aoti_torch_library_impl(lib_, name, fn);
|
|
return *this;
|
|
}
|
|
|
|
// corresponds to a limited, stable version of torch::library::def()
|
|
StableLibrary& def(const char* schema) {
|
|
aoti_torch_library_def(lib_, schema);
|
|
return *this;
|
|
}
|
|
};
|
|
|
|
class StableTorchLibraryInit final {
|
|
private:
|
|
using InitFn = void(StableLibrary&);
|
|
StableLibrary lib_;
|
|
|
|
public:
|
|
StableTorchLibraryInit(
|
|
StableLibrary::Kind kind,
|
|
InitFn* fn,
|
|
const char* ns,
|
|
const char* k,
|
|
const char* file,
|
|
uint32_t line)
|
|
: lib_(kind, ns, k, file, line) {
|
|
fn(lib_);
|
|
}
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// macros copied from c10/macros/Macros.h
|
|
#ifdef __COUNTER__
|
|
#define STABLE_UID __COUNTER__
|
|
#else
|
|
#define STABLE_UID __LINE__
|
|
#endif
|
|
|
|
#define STABLE_CONCATENATE_IMPL(s1, s2) s1##s2
|
|
#define STABLE_CONCATENATE(s1, s2) STABLE_CONCATENATE_IMPL(s1, s2)
|
|
// end of macros copied from c10/macros/Macros.h
|
|
|
|
#define STABLE_TORCH_LIBRARY_IMPL(ns, k, m) \
|
|
_STABLE_TORCH_LIBRARY_IMPL(ns, k, m, STABLE_UID)
|
|
|
|
#define _STABLE_TORCH_LIBRARY_IMPL(ns, k, m, uid) \
|
|
static void STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_IMPL_init_##ns##_##k##_, uid)(StableLibrary&); \
|
|
static const StableTorchLibraryInit STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_IMPL_static_init_##ns##_##k##_, uid)( \
|
|
StableLibrary::Kind::IMPL, \
|
|
&STABLE_CONCATENATE(STABLE_TORCH_LIBRARY_IMPL_init_##ns##_##k##_, uid), \
|
|
#ns, \
|
|
#k, \
|
|
__FILE__, \
|
|
__LINE__); \
|
|
void STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_IMPL_init_##ns##_##k##_, uid)(StableLibrary & m)
|
|
|
|
#define STABLE_TORCH_LIBRARY(ns, m) \
|
|
static void STABLE_TORCH_LIBRARY_init_##ns(StableLibrary&); \
|
|
static const StableTorchLibraryInit STABLE_TORCH_LIBRARY_static_init_##ns( \
|
|
StableLibrary::Kind::DEF, \
|
|
&STABLE_TORCH_LIBRARY_init_##ns, \
|
|
#ns, \
|
|
nullptr, \
|
|
__FILE__, \
|
|
__LINE__); \
|
|
void STABLE_TORCH_LIBRARY_init_##ns(StableLibrary& m)
|
|
|
|
#define STABLE_TORCH_LIBRARY_FRAGMENT(ns, m) \
|
|
_STABLE_TORCH_LIBRARY_FRAGMENT(ns, m, STABLE_UID)
|
|
|
|
#define _STABLE_TORCH_LIBRARY_FRAGMENT(ns, m, uid) \
|
|
static void STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_FRAGMENT_init_##ns##_, uid)(StableLibrary&); \
|
|
static const StableTorchLibraryInit STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_FRAGMENT_static_init_##ns##_, uid)( \
|
|
StableLibrary::Kind::FRAGMENT, \
|
|
&STABLE_CONCATENATE(STABLE_TORCH_LIBRARY_FRAGMENT_init_##ns##_, uid), \
|
|
#ns, \
|
|
nullptr, \
|
|
__FILE__, \
|
|
__LINE__); \
|
|
void STABLE_CONCATENATE( \
|
|
STABLE_TORCH_LIBRARY_FRAGMENT_init_##ns##_, uid)(StableLibrary & m)
|