OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Reflect renaming of OS X to macOS (#3795)

Browse Source
This commit is contained in:
Scott Stevenson 2017-11-20 21:52:10 +00:00 committed by Soumith Chintala
parent 4bce69be22
commit a9ef76b9c6
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -50,6 +50,6 @@ test/data/linear.pt
*.swp
*~
# OSX dir files
# macOS dir files
.DS_Store

4
README.md
View File

@ -177,7 +177,7 @@ conda install numpy pyyaml mkl setuptools cmake cffi
conda install -c soumith magma-cuda80 # or magma-cuda75 if CUDA 7.5
```
On OSX
On macOS
```bash
export CMAKE_PREFIX_PATH=[anaconda root directory]
conda install numpy pyyaml setuptools cmake cffi
@ -193,7 +193,7 @@ On Linux
python setup.py install
```
On OSX
On macOS
```bash
MACOSX_DEPLOYMENT_TARGET=10.9 CC=clang CXX=clang++ python setup.py install
```

2
aten/README.md
View File

@ -37,7 +37,7 @@ TH/THC/THNN/THCUNN are provided (as git subtrees), so the repo is standalone. Yo
# Install pyyaml used by python code generation to read API declarations
# OSX: if you don't have pip
# macOS: if you don't have pip
sudo easy_install pip
# Ubuntu: if you don't have pip
apt-get -y install python-pip

2
aten/src/ATen/CMakeLists.txt
View File

@ -89,7 +89,7 @@ IF ($ENV{TH_BINARY_BUILD})
MESSAGE(STATUS "TH_BINARY_BUILD detected. Statically linking libstdc++")
SET(CMAKE_CXX_FLAGS "-static-libstdc++ ${CMAKE_CXX_FLAGS}")
IF (UNIX AND NOT APPLE)
# hiding statically linked library symbols, this flag is not available for the linker under MACOSX
# hiding statically linked library symbols, this flag is not available for the linker under macOS
SET(CMAKE_CXX_FLAGS "-Wl,--exclude-libs,libstdc++.a ${CMAKE_CXX_FLAGS}")
ENDIF(UNIX AND NOT APPLE)
ENDIF()

2
aten/src/TH/THAllocator.c
View File

@ -321,7 +321,7 @@ static void *_map_alloc(void* ctx_, ptrdiff_t size)
close(fd);
THError("unable to stretch file <%s> to the right size", ctx->filename);
}
/* on OS X write returns with errno 45 (Opperation not supported) when used
/* on macOS write returns with errno 45 (Opperation not supported) when used
* with a file descriptor obtained via shm_open
*/
#ifndef __APPLE__

2
setup.py
View File

@ -671,7 +671,7 @@ if WITH_CUDA:
thnvrtc_link_flags += ['-lcuda', '-lnvrtc']
cuda_stub_path = [cuda_lib_path + '/stubs']
if IS_DARWIN:
# on OSX this is where the CUDA stub is installed according to the manual
# on macOS this is where the CUDA stub is installed according to the manual
cuda_stub_path = ["/usr/local/cuda/lib"]
THNVRTC = Extension("torch._nvrtc",
sources=['torch/csrc/nvrtc.cpp'],

8
test/test_multiprocessing.py
View File

@ -239,15 +239,15 @@ class TestMultiprocessing(TestCase):
for i in range(repeat):
do_test()
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on OS X")
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on macOS")
def test_fd_sharing(self):
self._test_sharing(repeat=TEST_REPEATS)
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on OS X")
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on macOS")
def test_fd_preserve_sharing(self):
self._test_preserve_sharing(repeat=TEST_REPEATS)
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on OS X")
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on macOS")
def test_fd_pool(self):
self._test_pool(repeat=TEST_REPEATS)
@ -404,7 +404,7 @@ class TestMultiprocessing(TestCase):
t.share_memory_()
self.assertTrue(t.is_shared())
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on OS X")
@unittest.skipIf(platform == 'darwin', "file descriptor strategy is not supported on macOS")
def test_is_shared(self):
self._test_is_shared()

2
torch/lib/THD/CMakeLists.txt
View File

@ -34,7 +34,7 @@ int main() {
IF(NOT HAS_THREAD_LOCAL)
MESSAGE(FATAL_ERROR "thread_local not supported. THD requires a compiler"
" that supports thread_local. Please upgrade your "
"compiler. If you are on OSX, upgrade to "
"compiler. If you are on macOS, upgrade to "
"XCode 8 or newer.")
ENDIF(NOT HAS_THREAD_LOCAL)

2
torch/lib/libshm/CMakeLists.txt
View File

@ -26,7 +26,7 @@ IF ($ENV{PYTORCH_BINARY_BUILD})
SET(CMAKE_CXX_FLAGS "-static-libstdc++ ${CMAKE_CXX_FLAGS}")
IF (UNIX AND NOT APPLE)
# hiding statically linked library symbols, this flag is not available for the linker under MACOSX
# hiding statically linked library symbols, this flag is not available for the linker under macOS
SET(CMAKE_CXX_FLAGS "-Wl,--exclude-libs,libstdc++.a ${CMAKE_CXX_FLAGS}")
ENDIF(UNIX AND NOT APPLE)