Skip to content

Build the indexing library with the correct Metal version #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DenisVieriu97 merged 1 commit into from
Jul 15, 2022
Merged

Build the indexing library with the correct Metal version #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion aten/src/ATen/mps/MPSDevice.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,32 @@
static std::unique_ptr<MPSDevice> mps_device;
static c10::once_flag mpsdev_init;

static inline MTLLanguageVersion getMetalLanguageVersion(const id<MTLDevice>& device) {
#if defined(__MAC_10_13) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13
#else
#error "Metal is not available on the current platform."
#endif

// MPS Advanced Indexing needs at least Metal 2.0 (support for Argument Buffer and function constants)
MTLLanguageVersion languageVersion;
if (@available(macOS 13.0, *)) {
languageVersion = MTLLanguageVersion3_0;
} else if (@available(macOS 12.0, *)) {
languageVersion = MTLLanguageVersion2_4;
} else if (@available(macOS 11.0, *)) {
languageVersion = MTLLanguageVersion2_3;
} else if (@available(macOS 10.15, *)) {
languageVersion = MTLLanguageVersion2_2;
} else if (@available(macOS 10.14, *)) {
languageVersion = MTLLanguageVersion2_1;
} else if (@available(macOS 10.13, *)) {
languageVersion = MTLLanguageVersion2_0;
}

TORCH_CHECK([device supportsFamily:MTLGPUFamilyMac2], "Missing Metal support for MTLGPUFamilyMac2");
return languageVersion;
}

MPSDevice* MPSDevice::getInstance() {
c10::call_once(mpsdev_init, [] {
mps_device = std::unique_ptr<MPSDevice>(new MPSDevice());
Expand All @@ -22,8 +48,11 @@
assert(_mtl_device);
NSError* error = nil;
if (!_mtl_indexing_library) {
MTLCompileOptions *options = [MTLCompileOptions new];
[options setLanguageVersion: getMetalLanguageVersion(_mtl_device)];
[options setFastMathEnabled: YES];
Copy link
Owner

@kulinseth kulinseth Jul 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets leave it as default , currently its YES.

_mtl_indexing_library = [_mtl_device newLibraryWithSource: [NSString stringWithCString: mps::indexing_metal_shaders encoding:NSASCIIStringEncoding]
options: nil
options: options
error: &error];
TORCH_CHECK(_mtl_indexing_library, "Failed to create indexing library, error: ", [[error description] UTF8String]);
}
Expand Down
4 changes: 4 additions & 0 deletions aten/src/ATen/native/mps/operations/Indexing.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ bool dispatchIndexSelectKernel(TensorIteratorBase& iter, IntArrayRef index_size,
using namespace mps;

@autoreleasepool {
if (iter.numel() == 0) {
return true;
}

const Tensor& inputTensor = iter.tensor(1);
Tensor outputTensor = iter.tensor(0);

Expand Down