Merge remote-tracking branch 'origin/master' into sciagraph-multiprocessing

Author: pythonspeed

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/benchmarks.yml

@@ -25,7 +25,7 @@ jobs:
       PYTHONFAULTHANDLER: "true"
 
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
         with:
           # We need tags to get the correct code version:
           fetch-depth: 0

.github/workflows/main.yml

@@ -32,11 +32,11 @@ jobs:
       PYTHONFAULTHANDLER: "true"
 
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
         with:
           # We need tags to get the correct code version:
           fetch-depth: 0
-      - uses: "actions/setup-python@v2"
+      - uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.python-version }}"
       - uses: "actions-rs/toolchain@v1"
@@ -76,11 +76,11 @@ jobs:
           make test
       - name: "Build macOS wheels"
         if: startsWith(matrix.os, 'mac') && (matrix.python-version == '3.9')
-        uses: pypa/cibuildwheel@v2.7.0
+        uses: pypa/cibuildwheel@v2.9.0
         env:
           MACOSX_DEPLOYMENT_TARGET: "10.15"
           CIBW_ARCHS_MACOS: "x86_64 arm64"
-          CIBW_SKIP: "cp37-macosx_arm64 cp36*"
+          CIBW_SKIP: "cp37-macosx_arm64 cp36* pp*"
         with:
           output-dir: dist
       - name: "Build manylinux wheels"
@@ -125,7 +125,7 @@ jobs:
     name: "Documentation check and publish"
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
       - name: "Run mdbook"
         run: |
           set -euo pipefail
@@ -139,3 +139,42 @@ jobs:
           set -euo pipefail
           curl -X POST -d '{}' "$PUBLISH_DOCS_HOOK"
 
+  arm-wheels:
+    name: "Wheels for ARM64"
+    runs-on: "ubuntu-latest"
+    if: startsWith(github.event.ref, 'refs/tags')
+    env:
+      CIBW_ARCHS_LINUX: aarch64
+      CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y"
+      CIBW_BEFORE_BUILD: "touch filpreload/src/_filpreload.c"  # force rebuild of Python code with new interpreter
+      CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"'
+      CIBW_SKIP: "cp27-* cp34-* cp35-* cp36-* cp311-* pp* *-musllinux*"
+      CIBW_TEST_COMMAND: python -m filprofiler run {project}/benchmarks/pystone.py
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          # We need tags to get the correct code version:
+          fetch-depth: 0
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: arm64
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.9.0
+        with:
+          output-dir: dist
+      - uses: actions/upload-artifact@v2
+        with:
+          name: "arm64-wheel"
+          path: dist/*.whl
+      - name: Publish distribution 📦 to PyPI
+        if: startsWith(github.event.ref, 'refs/tags')
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: |
+            set -euo pipefail
+            pip install twine
+            twine check dist/*.whl
+            twine upload --repository pypi dist/filprofiler*.whl

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## Fil 2022.09.0 (2022-09-12)
+
+### Features
+
+- Added wheels for ARM on Linux (`aarch64`), useful for running native Docker images on ARM Macs. ([#395](https://github.com/pythonspeed/filprofiler/issues/395))
+
 ## Fil 2022.07.0 (2022-07-22)
 
 ### Bugfixes

Cargo.lock

@@ -10,11 +10,11 @@ license = "Apache-2.0"
 [dependencies]
 im = "15"
 itertools = "0.10"
-ahash = "0.7"
+ahash = "0.8"
 derivative = "2.2"
 lazy_static = "1.4"
 backtrace = "0.3"
-once_cell = "1.13"
+once_cell = "1.14"
 libloading = "0.7"
 libc = "0.2"
 serde = {version = "1", features = ["derive"] }

memapi/Cargo.toml

@@ -149,7 +149,7 @@ fn get_cgroup_paths<'a>(proc_cgroups: &'a str) -> Vec<&'a str> {
 /// Real system information.
 pub struct RealMemoryInfo {
     // The current process.
-    process: psutil::process::Process,
+    process: Option<psutil::process::Process>,
     // On Linux, the current cgroup _at startup_. If it changes after startup,
     // we'll be wrong, but that's unlikely.
     #[cfg(target_os = "linux")]
@@ -191,14 +191,14 @@ impl RealMemoryInfo {
         };
         Self {
             cgroup: cgroup,
-            process: psutil::process::Process::current().unwrap(),
+            process: psutil::process::Process::current().ok(),
         }
     }
 
     #[cfg(target_os = "macos")]
     pub fn new() -> Self {
         Self {
-            process: psutil::process::Process::current().unwrap(),
+            process: psutil::process::Process::current().ok(),
         }
     }
 
@@ -244,7 +244,10 @@ impl MemoryInfo for RealMemoryInfo {
     }
 
     fn get_resident_process_memory(&self) -> usize {
-        self.process.memory_info().unwrap().rss() as usize
+        self.process
+            .as_ref()
+            .and_then(|p| p.memory_info().map(|mi| mi.rss()).ok())
+            .unwrap_or(0) as usize
     }
 
     /// Print debugging info to stderr.
@@ -266,7 +269,7 @@ impl MemoryInfo for RealMemoryInfo {
         );
         eprintln!(
             "=fil-profile= Process memory info: {:?}",
-            self.process.memory_info()
+            self.process.as_ref().map(|p| p.memory_info())
         );
     }
 }