Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[test] Import changes to port sharedmem tables into OCaml 5.2 domain-based parallelism#926

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.

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

Already on GitHub?Sign in to your account

Draft
grievejia wants to merge14 commits intomain
base:main
Choose a base branch
Loading
fromocaml-5-2
Draft
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
170ff66
Build with OCaml 5.2.0...
OlivierNicoleJun 21, 2024
d2c7533
Change package versions (Dune internal error)
OlivierNicoleJun 27, 2024
3fc0e8c
Add dummy version number to avoid Dune crash
OlivierNicoleJun 28, 2024
763bb5c
mtime fixes
OlivierNicoleJun 28, 2024
b4ad9dd
setup script: don't install packages nor create the switch
OlivierNicoleJun 28, 2024
b8ffca8
Avoid error message when hg is not installed
OlivierNicoleJun 28, 2024
554a0d8
Limit parallel jobs for test suite
OlivierNicoleJul 11, 2024
e1cea2b
Remove mmap-ed shared memory
OlivierNicoleJun 27, 2024
3712027
Switch to domain parallelism and fix some issues
OlivierNicoleJun 28, 2024
0e74c1a
Add Domainslib to list of needed packages
OlivierNicoleJul 11, 2024
3838b7b
Fix saving of shared database
OlivierNicoleJul 11, 2024
cc16e6f
Do not compile tests to bytecode
OlivierNicoleJul 11, 2024
b7ed3cf
Comment out last failing test for now
OlivierNicoleJul 11, 2024
4106905
Add TSan suppressions file for unrelated data races
OlivierNicoleJul 11, 2024
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: 2 additions & 2 deletionsscripts/generate-version-number.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/envbash
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
Expand DownExpand Up@@ -39,7 +39,7 @@ done

# Gather version information.
VERSION=""
if HG_VERSION="$(hg log -r . -T '{node}')"; then
if HG_VERSION="$(( type hg >& /dev/null ) &&hg log -r . -T '{node}')"; then
VERSION="${HG_VERSION}"
echo "HG revision: ${VERSION}"
elif GIT_VERSION="$(git rev-parse HEAD)"; then
Expand Down
19 changes: 19 additions & 0 deletionsscripts/package_list
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
base64.3.5.1
cmdliner.1.1.1
core.v0.16.2
domainslib.0.5.1
re2.v0.16.0
dune.3.16.0
yojson.2.0.2
jsonm.1.0.2
ppx_deriving_yojson.3.7.0
ppx_yojson_conv.v0.16.0
ounit2.2.2.7
menhir.20231231
lwt.5.7.0
lwt_ppx.2.1.0
ounit2-lwt.2.2.7
pyre-ast.0.1.9
mtime.2.0.0
errpy.0.0.9
kcas_data.0.7.0
104 changes: 62 additions & 42 deletionsscripts/setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,25 +28,28 @@
LOG: logging.Logger = logging.getLogger(__name__)


COMPILER_VERSION = "4.14.0"
COMPILER_VERSION = "5.2.0"
DEPENDENCIES = [
# If you change this, also update the package_list file!
"base64.3.5.1",
"cmdliner.1.1.1",
"core.v0.16.2",
"domainslib.0.5.1",
"re2.v0.16.0",
"dune.3.7.1",
"dune.3.16.0",
"yojson.2.0.2",
"jsonm.1.0.2",
"ppx_deriving_yojson.3.7.0",
"ppx_yojson_conv.v0.16.0",
"ounit2.2.2.7",
"menhir.20220210",
"lwt.5.6.1",
"menhir.20231231",
"lwt.5.7.0",
"lwt_ppx.2.1.0",
"ounit2-lwt.2.2.7",
"pyre-ast.0.1.11",
"mtime.1.4.0",
"mtime.2.0.0",
"errpy.0.0.9",
"kcas_data.0.7.0",
]


Expand DownExpand Up@@ -146,12 +149,20 @@ def _compiler_specification() -> str:
The format for how to specify this changed in 4.12.0, see
https://discuss.ocaml.org/t/experimental-new-layout-for-the-ocaml-variants-packages-in-opam-repository/6779
"""
return ",".join(
[
f"--packages=ocaml-variants.{COMPILER_VERSION}+options",
"ocaml-option-flambda",
]
)
if not release:
return ",".join(
[
f"--packages=ocaml-variants.{COMPILER_VERSION}+options",
"ocaml-option-tsan",
]
)
else:
return ",".join(
[
f"--packages=ocaml-variants.{COMPILER_VERSION}+options",
"ocaml-options-only-flambda",
]
)


def _opam_command(opam_version: Tuple[int, ...]) -> List[str]:
Expand DownExpand Up@@ -338,38 +349,39 @@ def full_setup(
add_environment_variables: Optional[Mapping[str, str]] = None,
rust_path: Optional[Path] = None,
) -> None:
opam_environment_variables: Mapping[
str, str
] = _install_dependencies(
opam_root,
opam_version,
add_environment_variables=add_environment_variables,
rust_path=rust_path,
)

def run_in_opam_environment(command: List[str]) -> None:
_run_command(
command,
current_working_directory=pyre_directory / "source",
add_environment_variables=opam_environment_variables,
)
#opam_environment_variables: Mapping[
# str, str
#] = set_opam_switch_and_install_dependencies(
# opam_root,
# opam_version,
# release=release,
# add_environment_variables=add_environment_variables,
# rust_path=rust_path,
#)

#def run_in_opam_environment(command: List[str]) -> None:
# _run_command(
# command,
# current_working_directory=pyre_directory / "source",
# add_environment_variables=opam_environment_variables,
# )

produce_dune_file(pyre_directory, build_type)
if run_clean:
# Note: we do not run `make clean` because we want the result of the
# explicit `produce_dune_file` to remain.
# Dune 3.7 runs into `rmdir` failure when cleaning the `_build` directory
# for some reason. Manually clean the dir to work around the issue.
run_in_opam_environment(["rm", "-rf", "_build"])
if release:
LOG.info("Running a release build. This may take a while.")
run_in_opam_environment(["make", "release"])
if run_tests:
run_in_opam_environment(["make", "release_test"])
else:
run_in_opam_environment(["make", "dev"])
if run_tests:
run_in_opam_environment(["make", "test"])
#if run_clean:
# # Note: we do not run `make clean` because we want the result of the
# # explicit `produce_dune_file` to remain.
# # Dune 3.7 runs into `rmdir` failure when cleaning the `_build` directory
# # for some reason. Manually clean the dir to work around the issue.
# run_in_opam_environment(["rm", "-rf", "_build"])
#if release:
# LOG.info("Running a release build. This may take a while.")
# run_in_opam_environment(["make", "release"])
# if run_tests:
# run_in_opam_environment(["make", "release_test"])
#else:
# run_in_opam_environment(["make", "dev"])
# if run_tests:
# run_in_opam_environment(["make", "test"])


def _make_opam_root(local: bool) -> Path:
Expand DownExpand Up@@ -422,7 +434,15 @@ def setup(
if parsed.configure:
produce_dune_file(pyre_directory, build_type)
else:
initialize_opam_switch(opam_root, opam_version, release, add_environment_variables, parsed.rust_path)
if not _opam_already_initialized(opam_root):
LOG.info("opam not detected as initialized. Initializing.")
exit(1)
initialize_opam_switch(
opam_root, opam_version, release, add_environment_variables
)
else:
LOG.info("opam already initialized.")
opam_update(opam_root, opam_version, add_environment_variables)
full_setup(
opam_root,
opam_version,
Expand Down
4 changes: 3 additions & 1 deletionscripts/setup.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
#!/bin/bash
#!/usr/bin/envbash
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -euo pipefail

# Switch to pyre directory.
cd "$(dirname "$0")/.."

Expand Down
2 changes: 1 addition & 1 deletionsource/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ dev: configure

.PHONY: test
test: dev
PYRE_CODE_ROOT="$(CURDIR)/.." OUNIT_SHARDS="1" dune runtest -jauto --profile dev
PYRE_CODE_ROOT="$(CURDIR)/.." OUNIT_SHARDS="1" dune runtest -j3 --profile dev

.PHONY: stubs_integration_test
stubs_integration_test: dev
Expand Down
2 changes: 1 addition & 1 deletionsource/code_navigation_server/test/dune
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
(tests
(names
basicTest
subscriptionTest
;subscriptionTest
criticalFileTest
buildSystemTest
stateTest)
Expand Down
2 changes: 1 addition & 1 deletionsource/hack_parallel.opam
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
opam-version: "2.0"
version: ""
version: "0.1"
maintainer: "pyre@fb.com"
authors: ["Pyre team"]
homepage: "https://github.com/facebook/pyre-check"
Expand Down
2 changes: 1 addition & 1 deletionsource/hack_parallel/hack_parallel/heap/dune
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@
(names hh_assert hh_shared hh_shared_sqlite dictionary_compression_data))
(name hack_heap)
(package hack_parallel)
(libraries hack_collections zstd lz4 sqlite3 hack_utils))
(libraries hack_collections zstd lz4 sqlite3 hack_utils kcas_data))
Loading
[8]ページ先頭
©2009-2026 Movatter.jp