mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-20 21:14:14 +08:00
5bcbbf5373
Summary: *Context:* https://github.com/pytorch/pytorch/issues/53406 added a lint for trailing whitespace at the ends of lines. However, in order to pass FB-internal lints, that PR also had to normalize the trailing newlines in four of the files it touched. This PR adds an OSS lint to normalize trailing newlines. The changes to the following files (made in 54847d0adb9be71be4979cead3d9d4c02160e4cd) are the only manually-written parts of this PR: - `.github/workflows/lint.yml` - `mypy-strict.ini` - `tools/README.md` - `tools/test/test_trailing_newlines.py` - `tools/trailing_newlines.py` I would have liked to make this just a shell one-liner like the other three similar lints, but nothing I could find quite fit the bill. Specifically, all the answers I tried from the following Stack Overflow questions were far too slow (at least a minute and a half to run on this entire repository): - [How to detect file ends in newline?](https://stackoverflow.com/q/38746) - [How do I find files that do not end with a newline/linefeed?](https://stackoverflow.com/q/4631068) - [How to list all files in the Git index without newline at end of file](https://stackoverflow.com/q/27624800) - [Linux - check if there is an empty line at the end of a file [duplicate]](https://stackoverflow.com/q/34943632) - [git ensure newline at end of each file](https://stackoverflow.com/q/57770972) To avoid giving false positives during the few days after this PR is merged, we should probably only merge it after https://github.com/pytorch/pytorch/issues/54967. Pull Request resolved: https://github.com/pytorch/pytorch/pull/54737 Test Plan: Running the shell script from the "Ensure correct trailing newlines" step in the `quick-checks` job of `.github/workflows/lint.yml` should print no output and exit in a fraction of a second with a status of 0. That was not the case prior to this PR, as shown by this failing GHA workflow run on an earlier draft of this PR: - https://github.com/pytorch/pytorch/runs/2197446987?check_suite_focus=true In contrast, this run (after correcting the trailing newlines in this PR) succeeded: - https://github.com/pytorch/pytorch/pull/54737/checks?check_run_id=2197553241 To unit-test `tools/trailing_newlines.py` itself (this is run as part of our "Test tools" GitHub Actions workflow): ``` python tools/test/test_trailing_newlines.py ``` Reviewed By: malfet Differential Revision: D27409736 Pulled By: samestep fbshipit-source-id: 46f565227046b39f68349bbd5633105b2d2e9b19
58 lines
2.3 KiB
CMake
58 lines
2.3 KiB
CMake
# - Find the NumPy libraries
|
|
# This module finds if NumPy is installed, and sets the following variables
|
|
# indicating where it is.
|
|
#
|
|
# TODO: Update to provide the libraries and paths for linking npymath lib.
|
|
#
|
|
# NUMPY_FOUND - was NumPy found
|
|
# NUMPY_VERSION - the version of NumPy found as a string
|
|
# NUMPY_VERSION_MAJOR - the major version number of NumPy
|
|
# NUMPY_VERSION_MINOR - the minor version number of NumPy
|
|
# NUMPY_VERSION_PATCH - the patch version number of NumPy
|
|
# NUMPY_VERSION_DECIMAL - e.g. version 1.6.1 is 10601
|
|
# NUMPY_INCLUDE_DIR - path to the NumPy include files
|
|
|
|
unset(NUMPY_VERSION)
|
|
unset(NUMPY_INCLUDE_DIR)
|
|
|
|
if(PYTHONINTERP_FOUND)
|
|
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
|
|
"import numpy as n; print(n.__version__); print(n.get_include());"
|
|
RESULT_VARIABLE __result
|
|
OUTPUT_VARIABLE __output
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
|
if(__result MATCHES 0)
|
|
string(REGEX REPLACE ";" "\\\\;" __values ${__output})
|
|
string(REGEX REPLACE "\r?\n" ";" __values ${__values})
|
|
list(GET __values 0 NUMPY_VERSION)
|
|
list(GET __values 1 NUMPY_INCLUDE_DIR)
|
|
|
|
string(REGEX MATCH "^([0-9])+\\.([0-9])+\\.([0-9])+" __ver_check "${NUMPY_VERSION}")
|
|
if(NOT "${__ver_check}" STREQUAL "")
|
|
set(NUMPY_VERSION_MAJOR ${CMAKE_MATCH_1})
|
|
set(NUMPY_VERSION_MINOR ${CMAKE_MATCH_2})
|
|
set(NUMPY_VERSION_PATCH ${CMAKE_MATCH_3})
|
|
math(EXPR NUMPY_VERSION_DECIMAL
|
|
"(${NUMPY_VERSION_MAJOR} * 10000) + (${NUMPY_VERSION_MINOR} * 100) + ${NUMPY_VERSION_PATCH}")
|
|
string(REGEX REPLACE "\\\\" "/" NUMPY_INCLUDE_DIR ${NUMPY_INCLUDE_DIR})
|
|
else()
|
|
unset(NUMPY_VERSION)
|
|
unset(NUMPY_INCLUDE_DIR)
|
|
message(STATUS "Requested NumPy version and include path, but got instead:\n${__output}\n")
|
|
endif()
|
|
endif()
|
|
else()
|
|
message(STATUS "To find NumPy Python interpretator is required to be found.")
|
|
endif()
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(NumPy REQUIRED_VARS NUMPY_INCLUDE_DIR NUMPY_VERSION
|
|
VERSION_VAR NUMPY_VERSION)
|
|
|
|
if(NUMPY_FOUND)
|
|
message(STATUS "NumPy ver. ${NUMPY_VERSION} found (include: ${NUMPY_INCLUDE_DIR})")
|
|
endif()
|
|
|
|
caffe_clear_vars(__result __output __error_value __values __ver_check __error_value)
|