Skip to content

Added support for loading Python at runtime (supports both Python 3 and 2) #20674

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
merged 15 commits into from
Dec 4, 2018
Merged

Added support for loading Python at runtime (supports both Python 3 and 2) #20674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
912e6ff
Added new PythonLibrary struct to load Python library and symbols dyn…
pvieito Nov 18, 2018
fb34719
Style and structure changes
pvieito Nov 20, 2018
b56d3cf
Adding support for setting a Python version on-process
pvieito Nov 21, 2018
a095e61
Default minor version to nil
pvieito Nov 21, 2018
bf3dfa0
Cleaned private method
pvieito Nov 21, 2018
f39ea45
Update CMakeLists adding new files and removing CPython module
pvieito Nov 21, 2018
fc8f5d1
Force setting an non-nil value type for Linux
pvieito Nov 21, 2018
e1d5249
Redefined Python symbols to avoid libSyntax bug (SR-9316)
pvieito Nov 22, 2018
a0e79f3
Update tests
rxwei Dec 2, 2018
2076fb9
`init(owning:)` should retain, while `init(borrowing:)` should not.
rxwei Dec 3, 2018
d9a2b80
Use loaded symbol values instead of their addresses as the type argum…
rxwei Dec 3, 2018
9d3d4e0
Make loaded symbols `let`s since they are themselves the address we need
rxwei Dec 3, 2018
6267b75
Minor clean-up.
rxwei Dec 3, 2018
25290a4
Delete `_Py_TrueStructb`
rxwei Dec 3, 2018
8f749f4
Fix ParsableInterface tests
rxwei Dec 3, 2018
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
4 changes: 1 addition & 3 deletions stdlib/public/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ if(SWIFT_BUILD_STDLIB)
endif()

# SWIFT_ENABLE_TENSORFLOW
find_package(PythonLibs 2.7 EXACT)
if(SWIFT_BUILD_STDLIB AND PYTHONLIBS_FOUND)
add_subdirectory(CPython)
if(SWIFT_BUILD_STDLIB)
add_subdirectory(Python)
endif()

Expand Down
73 changes: 0 additions & 73 deletions stdlib/public/CPython/CMakeLists.txt
View file
Open in desktop

This file was deleted.

162 changes: 0 additions & 162 deletions stdlib/public/CPython/module.modulemap
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions stdlib/public/Python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
#
#===----------------------------------------------------------------------===#

find_package(PythonLibs 2.7 EXACT REQUIRED)
message(STATUS "Building Python.")

set(SWIFT_PYTHON_EXISTS TRUE PARENT_SCOPE)

set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES)
Expand All @@ -29,9 +26,10 @@ endif()

add_swift_target_library(swiftPython ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
Python.swift
PythonLibrary.swift
PythonLibrary+Symbols.swift
NumpyConversion.swift

DEPENDS cpython_modulemap
TARGET_SDKS OSX CYGWIN FREEBSD LINUX HAIKU
SWIFT_MODULE_DEPENDS_IOS Darwin
SWIFT_MODULE_DEPENDS_OSX Darwin
Expand All @@ -42,5 +40,4 @@ add_swift_target_library(swiftPython ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
PRIVATE_LINK_LIBRARIES "${PYTHON_LIBRARIES}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
2 changes: 1 addition & 1 deletion stdlib/public/Python/NumpyConversion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
Expand Down
Loading